* imported changes from apt--main

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-28
   Fix permissions (again)

 * apt@packages.debian.org/apt--main--0--patch-29
   Call setlocale in all methods, don't call bindtextdomain in http

debian/changelog

@@ -1,7 +1,7 @@
 apt (0.5.32) unstable; urgency=low
 
-  * Call setlocale and bindtextdomain in the http method, so that the
-    messages are properly localised (Closes: #282700)
+  * Call setlocale in the http methods, so that the messages are properly
+    localised (Closes: #282700)
 
  --
 

methods/cdrom.cc

@@ -187,6 +187,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
+   setlocale(LC_ALL, "");
+
    CDROMMethod Mth;
    return Mth.Run();
 }

methods/copy.cc

@@ -86,6 +86,8 @@ bool CopyMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
+   setlocale(LC_ALL, "");
+
    CopyMethod Mth;
    return Mth.Run();
 }

methods/file.cc

@@ -83,6 +83,8 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
+   setlocale(LC_ALL, "");
+
    FileMethod Mth;
    return Mth.Run();
 }

methods/ftp.cc

@@ -1083,6 +1083,8 @@ bool FtpMethod::Fetch(FetchItem *Itm)
 
 int main(int argc,const char *argv[])
 { 
+   setlocale(LC_ALL, "");
+
    /* See if we should be come the http client - we do this for http
       proxy urls */
    if (getenv("ftp_proxy") != 0)

methods/gzip.cc

@@ -154,6 +154,8 @@ bool GzipMethod::Fetch(FetchItem *Itm)
 
 int main(int argc, char *argv[])
 {
+   setlocale(LC_ALL, "");
+
    GzipMethod Mth;
 
    Prog = strrchr(argv[0],'/');

methods/http.cc

@@ -1184,7 +1184,6 @@ int HttpMethod::Loop()
 int main()
 {
    setlocale(LC_ALL, "");
-   bindtextdomain(APT_DOMAIN, _config->FindDir("Dir::Locale").c_str());
 
    HttpMethod Mth;
    

methods/rsh.cc

@@ -511,6 +511,8 @@ bool RSHMethod::Fetch(FetchItem *Itm)
 
 int main(int argc, const char *argv[])
 {
+   setlocale(LC_ALL, "");
+
    RSHMethod Mth;
    Prog = strrchr(argv[0],'/');
    Prog++;