diff options
| -rw-r--r-- | apt-pkg/cachefilter.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.cc | 3 | ||||
| -rw-r--r-- | cmdline/apt-extracttemplates.cc | 6 | ||||
| -rw-r--r-- | cmdline/apt-internal-solver.cc | 7 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | ftparchive/cachedb.cc | 5 | ||||
| -rw-r--r-- | ftparchive/contents.cc | 4 | ||||
| -rw-r--r-- | ftparchive/override.cc | 3 |
8 files changed, 22 insertions, 13 deletions
diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc index 9ec3fa699..fb444208c 100644 --- a/apt-pkg/cachefilter.cc +++ b/apt-pkg/cachefilter.cc @@ -10,11 +10,11 @@ #include <apt-pkg/error.h> #include <apt-pkg/pkgcache.h> -#include <apti18n.h> - #include <string> #include <regex.h> + +#include <apti18n.h> /*}}}*/ namespace APT { namespace CacheFilter { diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index b56619ef5..06151a165 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -25,9 +25,10 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/sptr.h> -#include <apti18n.h> #include <iostream> #include <fcntl.h> + +#include <apti18n.h> /*}}}*/ using namespace std; diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 60efafba5..8fe15fdf9 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -36,11 +36,13 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> +#include <locale.h> + #include <fstream> -#include <locale.h> -#include <apti18n.h> #include "apt-extracttemplates.h" + +#include <apti18n.h> /*}}}*/ using namespace std; diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc index 25ecb7af1..e7faf88a9 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -7,6 +7,8 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include <config.h> + #include <apt-pkg/error.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/init.h> @@ -18,11 +20,10 @@ #include <apt-pkg/fileutl.h> #include <apt-pkg/pkgsystem.h> -#include <config.h> -#include <apti18n.h> - #include <unistd.h> #include <cstdio> + +#include <apti18n.h> /*}}}*/ // ShowHelp - Show a help screen /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 2c4bde370..8eec902d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,8 +33,9 @@ apt (0.9.3) unstable; urgency=low s390x and ppc64 (Closes: #669427) * apt-pkg/deb/deblistparser.cc: - check length and containing chars for a given description md5sum + * ensure that apti18n.h is included last as advertised (Closes: #671623) - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 05 May 2012 02:02:41 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 05 May 2012 15:35:16 +0200 apt (0.9.2) unstable; urgency=low diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index a8b637a80..c2318bf53 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -19,11 +19,12 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> #include <apt-pkg/fileutl.h> - + #include <netinet/in.h> // htonl, etc -#include <apti18n.h> #include "cachedb.h" + +#include <apti18n.h> /*}}}*/ // CacheDB::ReadyDB - Ready the DB2 /*{{{*/ diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index bbc5a1e2b..015c790e0 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -38,13 +38,15 @@ #include <apt-pkg/debfile.h> #include <apt-pkg/extracttar.h> #include <apt-pkg/error.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <malloc.h> -#include <apti18n.h> #include "contents.h" + +#include <apti18n.h> /*}}}*/ // GenContents::~GenContents - Free allocated memory /*{{{*/ diff --git a/ftparchive/override.cc b/ftparchive/override.cc index d363fd0fe..760c20120 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -12,13 +12,14 @@ // Include Files /*{{{*/ #include <config.h> -#include <apti18n.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <stdio.h> #include "override.h" + +#include <apti18n.h> /*}}}*/ // Override::ReadOverride - Read the override file /*{{{*/ |