* Patch from Eric Wong <normalperson@yhbt.net> to inclu...

Author: mdz
Date: 2004-01-07 20:39:37 GMT
* Patch from Eric Wong <normalperson@yhbt.net> to include apt18n.h after
other headers to avoid breaking locale.h when setlocale() is defined
as an empty macro (Closes: #226509)

16 files changed, 39 insertions, 30 deletions

diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index b423eb4cb..eb708271e 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: arfile.cc,v 1.6 2003/07/18 14:15:11 mdz Exp $
+// $Id: arfile.cc,v 1.7 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    AR File - Handle an 'AR' archive
@@ -17,13 +17,13 @@
 #ifdef __GNUG__
 #pragma implementation "apt-pkg/arfile.h"
 #endif
-#include <apti18n.h>
 #include <apt-pkg/arfile.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 
 #include <stdlib.h>
 									/*}}}*/
+#include <apti18n.h>
 
 struct ARArchive::MemberHeader
 {
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 5d939bd80..63bb2ba80 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: extracttar.cc,v 1.8 2003/07/18 15:35:23 mdz Exp $
+// $Id: extracttar.cc,v 1.9 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    Extract a Tar - Tar Extractor
@@ -19,7 +19,6 @@
 #ifdef __GNUG__
 #pragma implementation "apt-pkg/extracttar.h"
 #endif
-#include <apti18n.h>
 #include <apt-pkg/extracttar.h>
 
 #include <apt-pkg/error.h>
@@ -32,7 +31,9 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
+
 using namespace std;
     
 // The on disk header for a tar file.
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 5c8339637..d3a39911d 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: debfile.cc,v 1.3 2003/02/10 00:36:12 doogie Exp $
+// $Id: debfile.cc,v 1.4 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    Debian Archive File (.deb)
@@ -20,7 +20,6 @@
 #pragma implementation "apt-pkg/debfile.h"
 #endif
 
-#include <apti18n.h>
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
@@ -28,6 +27,7 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
+#include <apti18n.h>
 									/*}}}*/
 
 // DebFile::debDebFile - Constructor					/*{{{*/
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index f71811a9b..d06ff6353 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: dpkgdb.cc,v 1.7 2003/02/10 00:36:12 doogie Exp $
+// $Id: dpkgdb.cc,v 1.8 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    DPKGv1 Database Implemenation
@@ -17,7 +17,6 @@
 #pragma implementation "apt-pkg/dpkgdb.h"
 #endif
 
-#include <apti18n.h>
 #include <apt-pkg/dpkgdb.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
@@ -33,6 +32,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 721041fe5..3821156e2 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: dirstream.cc,v 1.3 2003/02/10 00:36:12 doogie Exp $
+// $Id: dirstream.cc,v 1.4 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    Directory Stream 
@@ -15,7 +15,6 @@
 #pragma implementation "apt-pkg/dirstream.h"
 #endif
 
-#include <apti18n.h>
 #include <apt-pkg/dirstream.h>
 #include <apt-pkg/error.h>
 
@@ -25,6 +24,7 @@
 #include <errno.h>
 #include <utime.h>
 #include <unistd.h>
+#include <apti18n.h>
 									/*}}}*/
 
 // DirStream::DoItem - Process an item					/*{{{*/
diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc
index 437cfbb55..d06cd57f5 100644
--- a/apt-inst/extract.cc
+++ b/apt-inst/extract.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: extract.cc,v 1.6 2003/02/10 00:36:12 doogie Exp $
+// $Id: extract.cc,v 1.7 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    Archive Extraction Directory Stream
@@ -47,7 +47,6 @@
 #ifdef __GNUG__
 #pragma implementation "apt-pkg/extract.h"
 #endif
-#include <apti18n.h>
 #include <apt-pkg/extract.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/debversion.h>
@@ -58,6 +57,7 @@
 #include <errno.h>
 #include <dirent.h>
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
 using namespace std;
 
diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc
index 446b9f561..ee8cbbf73 100644
--- a/apt-inst/filelist.cc
+++ b/apt-inst/filelist.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: filelist.cc,v 1.4 2003/02/10 00:36:12 doogie Exp $
+// $Id: filelist.cc,v 1.5 2004/01/07 20:39:37 mdz Exp $
 /* ######################################################################
 
    File Listing - Manages a Cache of File -> Package names.
@@ -36,7 +36,6 @@
 #pragma implementation "apt-pkg/filelist.h"
 #endif
 
-#include <apti18n.h>
 #include <apt-pkg/filelist.h>
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
@@ -46,6 +45,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
diff --git a/debian/changelog b/debian/changelog
index d638d7f8a..7a5da1784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.5.21) unstable; urgency=low
+
+  * Patch from Eric Wong <normalperson@yhbt.net> to include apt18n.h after
+    other headers to avoid breaking locale.h when setlocale() is defined
+    as an empty macro (Closes: #226509)
+
+ --
+
 apt (0.5.20) unstable; urgency=low
 
   * Fixed German translations of "Suggested" from Christian Garbs
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index f6b0bc679..17872de29 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: cdrom.cc,v 1.20 2003/02/10 07:34:41 doogie Exp $
+// $Id: cdrom.cc,v 1.21 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    CDROM URI method for APT
@@ -8,7 +8,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
@@ -19,6 +18,7 @@
 #include <unistd.h>
 
 #include <iostream>
+#include <apti18n.h>
 									/*}}}*/
 
 using namespace std;
diff --git a/methods/connect.cc b/methods/connect.cc
index 23961d83b..d1d71b004 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: connect.cc,v 1.10 2003/02/10 07:34:41 doogie Exp $
+// $Id: connect.cc,v 1.11 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    Connect - Replacement connect call
@@ -11,7 +11,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include "connect.h"
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
@@ -27,6 +26,7 @@
 #include <netdb.h>
 
 #include "rfc2553emu.h"
+#include <apti18n.h>
 									/*}}}*/
 
 static string LastHost;
diff --git a/methods/copy.cc b/methods/copy.cc
index 87e77eda3..4cbfa3532 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: copy.cc,v 1.7 2003/02/10 07:34:41 doogie Exp $
+// $Id: copy.cc,v 1.8 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    Copy URI - This method takes a uri like a file: uri and copies it
@@ -9,7 +9,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -17,6 +16,7 @@
 #include <sys/stat.h>
 #include <utime.h>
 #include <unistd.h>
+#include <apti18n.h>
 									/*}}}*/
 
 class CopyMethod : public pkgAcqMethod
diff --git a/methods/file.cc b/methods/file.cc
index bf7d380c5..9fc5764d6 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: file.cc,v 1.9 2003/02/10 07:34:41 doogie Exp $
+// $Id: file.cc,v 1.10 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    File URI method for APT
@@ -13,12 +13,12 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
+#include <apti18n.h>
 									/*}}}*/
 
 class FileMethod : public pkgAcqMethod
diff --git a/methods/ftp.cc b/methods/ftp.cc
index fb84f3f55..cf2838e3f 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: ftp.cc,v 1.31 2003/08/10 02:24:39 mdz Exp $
+// $Id: ftp.cc,v 1.32 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    FTP Aquire Method - This is the FTP aquire method for APT.
@@ -15,7 +15,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -30,6 +29,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <iostream>
+#include <apti18n.h>
 
 // Internet stuff
 #include <netinet/in.h>
diff --git a/methods/gzip.cc b/methods/gzip.cc
index 35501cb0a..af1ac465e 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: gzip.cc,v 1.17 2003/02/10 07:34:41 doogie Exp $
+// $Id: gzip.cc,v 1.18 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    GZip method - Take a file URI in and decompress it into the target 
@@ -9,7 +9,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
@@ -21,6 +20,7 @@
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>
+#include <apti18n.h>
 									/*}}}*/
 
 const char *Prog;
diff --git a/methods/http.cc b/methods/http.cc
index 5cfad08c6..a5af28917 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: http.cc,v 1.56 2003/02/12 15:33:36 doogie Exp $
+// $Id: http.cc,v 1.57 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -25,7 +25,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/error.h>
@@ -40,6 +39,7 @@
 #include <errno.h>
 #include <string.h>
 #include <iostream>
+#include <apti18n.h>
 
 // Internet stuff
 #include <netdb.h>
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 6cd618201..2292e72e4 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: rsh.cc,v 1.6 2003/02/10 07:34:41 doogie Exp $
+// $Id: rsh.cc,v 1.7 2004/01/07 20:39:38 mdz Exp $
 /* ######################################################################
 
    RSH method - Transfer files via rsh compatible program
@@ -11,7 +11,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <apti18n.h>
 #include "rsh.h"
 #include <apt-pkg/error.h>
 
@@ -23,6 +22,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <apti18n.h>
 									/*}}}*/
 
 const char *Prog;