Browse Source

ensure that apti18n.h is included last as advertised (Closes: #671623)

tags/debian/0.9.3
David Kalnischkies 9 years ago
parent
commit
a00a9b44a1
8 changed files with 22 additions and 13 deletions
  1. +2
    -2
      apt-pkg/cachefilter.cc
  2. +2
    -1
      apt-pkg/packagemanager.cc
  3. +4
    -2
      cmdline/apt-extracttemplates.cc
  4. +4
    -3
      cmdline/apt-internal-solver.cc
  5. +2
    -1
      debian/changelog
  6. +3
    -2
      ftparchive/cachedb.cc
  7. +3
    -1
      ftparchive/contents.cc
  8. +2
    -1
      ftparchive/override.cc

+ 2
- 2
apt-pkg/cachefilter.cc View File

@@ -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 {


+ 2
- 1
apt-pkg/packagemanager.cc View File

@@ -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;



+ 4
- 2
cmdline/apt-extracttemplates.cc View File

@@ -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;


+ 4
- 3
cmdline/apt-internal-solver.cc View File

@@ -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 /*{{{*/


+ 2
- 1
debian/changelog View File

@@ -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



+ 3
- 2
ftparchive/cachedb.cc View File

@@ -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 /*{{{*/


+ 3
- 1
ftparchive/contents.cc View File

@@ -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 /*{{{*/


+ 2
- 1
ftparchive/override.cc View File

@@ -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 /*{{{*/


Loading…
Cancel
Save