* merged apt--no-pragma

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc apt-pkg/acquire-item.h
Simple merge

diff --cc apt-pkg/acquire-method.cc
Simple merge

diff --cc apt-pkg/acquire-method.h
Simple merge

diff --cc apt-pkg/acquire-worker.cc
Simple merge

diff --cc apt-pkg/acquire.cc
Simple merge

diff --cc apt-pkg/acquire.h
Simple merge

diff --cc apt-pkg/algorithms.cc
Simple merge

diff --cc apt-pkg/cacheiterators.h
Simple merge

diff --cc apt-pkg/cdrom.cc
Simple merge

diff --cc apt-pkg/cdrom.h
Simple merge

diff --cc apt-pkg/contrib/cdromutl.h
Simple merge

diff --cc apt-pkg/contrib/progress.cc
Simple merge

diff --cc apt-pkg/contrib/sha256.h
index 70b3ae2ad0178794de5ca2423e8fa9d16234ed7f,01b638d56979c9bf4052ea5d1efb5414378af282..c490bfa4df30cf348766f617470774013a9cdec3
--- 1/apt-pkg/contrib/sha256.h
--- 2/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@@ -14,12 -14,9 +14,8 @@@
  #ifndef APTPKG_SHA256_H
  #define APTPKG_SHA256_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/sha256.h"
- #endif 
- 
  #include <string>
  #include <algorithm>
 -#include <stdint.h>
  
  using std::string;
  using std::min;

diff --cc apt-pkg/contrib/strutl.cc
Simple merge

diff --cc apt-pkg/contrib/strutl.h
Simple merge

diff --cc apt-pkg/deb/debindexfile.cc
Simple merge

diff --cc apt-pkg/deb/debindexfile.h
Simple merge

diff --cc apt-pkg/deb/debmetaindex.cc
Simple merge

diff --cc apt-pkg/deb/debrecords.cc
index 5eb2d67bb9d63408170eb9ff04122dc1810249cb,6ecbd15d62695e1b1b174fc972dee5206340d9af..5421b3db706d0670b13f4071fd6b81bdaf2f8cab
--- 1/apt-pkg/deb/debrecords.cc
--- 2/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@@ -8,13 -8,8 +8,10 @@@
     ##################################################################### */
                                                                        /*}}}*/
  // Include Files                                                      /*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/debrecords.h"
- #endif
  #include <apt-pkg/debrecords.h>
 +#include <apt-pkg/strutl.h>
  #include <apt-pkg/error.h>
 +#include <langinfo.h>
                                                                        /*}}}*/
  
  // RecordParser::debRecordParser - Constructor                                /*{{{*/

diff --cc apt-pkg/deb/debrecords.h
index 24e5aab88761f231ab24622e4d64bae619286137,3f1956164fb6c1fe5d0360a2c21a51f0126a5d67..fdf8d762b9a0010188f39807ae87ffc2d47228a9
--- 1/apt-pkg/deb/debrecords.h
--- 2/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@@ -14,12 -14,7 +14,8 @@@
  #ifndef PKGLIB_DEBRECORDS_H
  #define PKGLIB_DEBRECORDS_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/debrecords.h"
- #endif 
- 
  #include <apt-pkg/pkgrecords.h>
 +#include <apt-pkg/indexfile.h>
  #include <apt-pkg/tagfile.h>
  
  class debRecordParser : public pkgRecords::Parser

diff --cc apt-pkg/deb/debsrcrecords.cc
Simple merge

diff --cc apt-pkg/deb/debsrcrecords.h
Simple merge

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc apt-pkg/deb/dpkgpm.h
Simple merge

diff --cc apt-pkg/depcache.cc
Simple merge

diff --cc apt-pkg/depcache.h
Simple merge

diff --cc apt-pkg/indexfile.cc
index fad38772b606c58a53763f803eb524b695c1b61b,63f692c1d5397a93f5fcecab83f53a43c8530029..2dda2d89223959d7a02648a5f3e1bf0bcbf89780
--- 1/apt-pkg/indexfile.cc
--- 2/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@@ -8,15 -8,8 +8,11 @@@
     ##################################################################### */
                                                                        /*}}}*/
  // Include Files                                                      /*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/indexfile.h"
- #endif
- 
 +#include <apt-pkg/configuration.h>
  #include <apt-pkg/indexfile.h>
  #include <apt-pkg/error.h>
 +
 +#include <clocale>
                                                                        /*}}}*/
  
  // Global list of Item supported

diff --cc apt-pkg/indexfile.h
Simple merge

diff --cc apt-pkg/orderlist.cc
Simple merge

diff --cc apt-pkg/packagemanager.cc
Simple merge

diff --cc apt-pkg/packagemanager.h
index 48f53576cf981517abd93f20be92a01e9ad686cf,35cdca913d26cdbba546063e345a67d04b6cf4fd..53600fb61acc32a4755528fc945901aea7729481
--- 1/apt-pkg/packagemanager.h
--- 2/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@@ -23,14 -23,9 +23,11 @@@
  #ifndef PKGLIB_PACKAGEMANAGER_H
  #define PKGLIB_PACKAGEMANAGER_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/packagemanager.h"
- #endif
  
  #include <string>
 +#include <iostream>
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/depcache.h>
  
  using std::string;
  

diff --cc apt-pkg/pkgcache.cc
index 93ad566419a505865d39dca3b20ed1f0898279e8,5672e60a4896b7fecf0eca290eed52b461a05ad8..7e3b9d78c9a5a58ebbb8913d69a5b421dc5f821f
--- 1/apt-pkg/pkgcache.cc
--- 2/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@@ -20,13 -20,7 +20,8 @@@
     ##################################################################### */
                                                                        /*}}}*/
  // Include Files                                                      /*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/pkgcache.h"
- #pragma implementation "apt-pkg/cacheiterators.h"
- #endif 
- 
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/indexfile.h>
  #include <apt-pkg/version.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/strutl.h>

diff --cc apt-pkg/pkgcache.h
Simple merge

diff --cc apt-pkg/pkgcachegen.cc
Simple merge

diff --cc apt-pkg/pkgcachegen.h
index fae1a60a6d0ab153c3e946e8a269bf5bdad33c97,70616c0a8f9bfab3e1369355daf65a8ed48ed802..a47b097b3185ead0650e4a3165df0345a4de6aca
--- 1/apt-pkg/pkgcachegen.h
--- 2/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@@ -19,12 -19,8 +19,9 @@@
  #ifndef PKGLIB_PKGCACHEGEN_H
  #define PKGLIB_PKGCACHEGEN_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/pkgcachegen.h"
- #endif 
  
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/md5.h>
  
  class pkgSourceList;
  class OpProgress;

diff --cc apt-pkg/pkgrecords.cc
Simple merge

diff --cc apt-pkg/pkgrecords.h
Simple merge

diff --cc apt-pkg/policy.cc
Simple merge

diff --cc apt-pkg/tagfile.cc
Simple merge

diff --cc po/apt-all.pot
Simple merge