* removed the pragma mess

64 files changed, 39 insertions, 206 deletions

diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 6c54d3e6b..96e18bc60 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -15,9 +15,6 @@
 #ifndef PKGLIB_ARFILE_H
 #define PKGLIB_ARFILE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/arfile.h"
-#endif
 
 #include <string>
 #include <apt-pkg/fileutl.h>
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 6daf00a27..42f8ef534 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -14,10 +14,6 @@
 #ifndef PKGLIB_EXTRACTTAR_H
 #define PKGLIB_EXTRACTTAR_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/extracttar.h"
-#endif
-
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/dirstream.h>
 
diff --git a/apt-inst/database.h b/apt-inst/database.h
index 0972d40cd..854ba1fbb 100644
--- a/apt-inst/database.h
+++ b/apt-inst/database.h
@@ -22,7 +22,6 @@
 #define PKGLIB_DATABASE_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/database.h"
 #endif
 
 #include <apt-pkg/filelist.h>
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index d89b85268..6b9f8ffc8 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -23,9 +23,6 @@
 #ifndef PKGLIB_DEBFILE_H
 #define PKGLIB_DEBFILE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/debfile.h"
-#endif
 
 #include <apt-pkg/arfile.h>
 #include <apt-pkg/database.h>
diff --git a/apt-inst/deb/dpkgdb.h b/apt-inst/deb/dpkgdb.h
index ddbb6d6f2..125845f96 100644
--- a/apt-inst/deb/dpkgdb.h
+++ b/apt-inst/deb/dpkgdb.h
@@ -19,9 +19,6 @@
 #ifndef PKGLIB_DPKGDB_H
 #define PKGLIB_DPKGDB_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/dpkgdb.h"
-#endif
 
 #include <apt-pkg/database.h>
 
diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h
index dfb480bd4..232a39f9d 100644
--- a/apt-inst/dirstream.h
+++ b/apt-inst/dirstream.h
@@ -26,7 +26,6 @@
 #define PKGLIB_DIRSTREAM_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/dirstream.h"
 #endif
 
 class pkgDirStream
diff --git a/apt-inst/extract.h b/apt-inst/extract.h
index a9152a26f..713e39433 100644
--- a/apt-inst/extract.h
+++ b/apt-inst/extract.h
@@ -18,7 +18,6 @@
 #define PKGLIB_EXTRACT_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/extract.h"
 #endif
 
 #include <apt-pkg/dirstream.h>
diff --git a/apt-inst/filelist.h b/apt-inst/filelist.h
index 7536a2f63..86766254f 100644
--- a/apt-inst/filelist.h
+++ b/apt-inst/filelist.h
@@ -28,9 +28,7 @@
 #ifndef PKGLIB_FILELIST_H
 #define PKGLIB_FILELIST_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/filelist.h"
-#endif
+
 
 #include <apt-pkg/mmap.h>
 
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index da1bea801..b47e198d8 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -27,9 +27,6 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/indexrecords.h>
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-item.h"
-#endif 
 
 // Item to acquire
 class pkgAcquire::Item
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index f46209d12..1c0b9f67c 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -16,9 +16,6 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-method.h"
-#endif 
 
 class Hashes;
 class pkgAcqMethod
diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index 6e1952202..d5f8c63d2 100644
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -14,9 +14,6 @@
 
 #include <apt-pkg/acquire.h>
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-worker.h"
-#endif 
 
 // Interfacing to the method process
 class pkgAcquire::Worker
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 27bb3d363..6e836ac49 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -38,9 +38,6 @@
 using std::vector;
 using std::string;
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire.h"
-#endif 
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index b95218061..b72874d8e 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -30,9 +30,6 @@
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/algorithms.h"
-#endif 
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index a128c29ab..d23841e5e 100644
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -17,9 +17,6 @@
 #ifndef PKGLIB_CACHEFILE_H
 #define PKGLIB_CACHEFILE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cachefile.h"
-#endif 
 
 #include <apt-pkg/depcache.h>
 
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 2b326bd65..c412eaa97 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -31,9 +31,6 @@
 #ifndef PKGLIB_CACHEITERATORS_H
 #define PKGLIB_CACHEITERATORS_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cacheiterators.h"
-#endif 
 
 // Package Iterator
 class pkgCache::PkgIterator
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 085eb64e2..b8b208c30 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -5,9 +5,6 @@
 #include<string>
 #include<vector>
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cdrom.h"
-#endif
 
 using namespace std;
 
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index 43164e250..2aee2bf54 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -10,9 +10,6 @@
 #ifndef APTPKG_CLEAN_H
 #define APTPKG_CLEAN_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/clean.h"
-#endif 
 
 #include <apt-pkg/pkgcache.h>
 
diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index 3180a03c7..1264982a8 100644
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -14,10 +14,6 @@
 
 using std::string;
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cdromutl.h"
-#endif 
-
 bool MountCdrom(string Path);
 bool UnmountCdrom(string Path);
 bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 8f461296f..fad6d1da9 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -44,9 +44,7 @@
 #ifndef PKGLIB_CMNDLINE_H
 #define PKGLIB_CMNDLINE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cmndline.h"
-#endif 
+
 
 #include <apt-pkg/configuration.h>
 
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 0d4078dab..2534692a3 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -28,9 +28,7 @@
 #ifndef PKGLIB_CONFIGURATION_H
 #define PKGLIB_CONFIGURATION_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/configuration.h"
-#endif 
+
 
 #include <string>
 #include <iostream>
diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h
index 757104c54..f30678bac 100644
--- a/apt-pkg/contrib/crc-16.h
+++ b/apt-pkg/contrib/crc-16.h
@@ -10,10 +10,6 @@
 #ifndef APTPKG_CRC16_H
 #define APTPKG_CRC16_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/crc-16.h"
-#endif 
-
 #define INIT_FCS  0xffff
 unsigned short AddCRC16(unsigned short fcs, void const *buf,
 			unsigned long len);
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index a5fc1a223..a3be6a575 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -40,9 +40,7 @@
 #ifndef PKGLIB_ERROR_H
 #define PKGLIB_ERROR_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/error.h"
-#endif 
+
 
 #ifdef __GNUG__
 // Methods have a hidden this parameter that is visible to this attribute
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 041aa3309..fcb26938f 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -22,7 +22,6 @@
 #define PKGLIB_FILEUTL_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/fileutl.h"
 #endif 
 
 #include <string>
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index eefa7bf41..263854054 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -14,7 +14,6 @@
 #define APTPKG_HASHES_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/hashes.h"
 #endif 
 
 #include <apt-pkg/md5.h>
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index e280d714e..247b3fab9 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -23,9 +23,6 @@
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/md5.h"
-#endif 
 
 #include <string>
 #include <algorithm>
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index e329b167a..46a3f2990 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -26,7 +26,6 @@
 #define PKGLIB_MMAP_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/mmap.h"
 #endif
 
 #include <string>
diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index 20caf4cdf..3f87f4d3a 100644
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -22,7 +22,6 @@
 #define PKGLIB_PROGRESS_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/progress.h"
 #endif 
 
 #include <string>
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index db8ca7893..010ef802e 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -14,10 +14,6 @@
 #ifndef APTPKG_SHA1_H
 #define APTPKG_SHA1_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/sha1.h"
-#endif 
-
 #include <string>
 #include <algorithm>
 
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index 9e88f5ece..01b638d56 100644
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -14,10 +14,6 @@
 #ifndef APTPKG_SHA256_H
 #define APTPKG_SHA256_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/sha256.h"
-#endif 
-
 #include <string>
 #include <algorithm>
 #include <stdint.h>
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 6ec2b7811..b8553ab58 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -16,9 +16,7 @@
 #ifndef STRUTL_H
 #define STRUTL_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/strutl.h"
-#endif 
+
 
 #include <stdlib.h>
 #include <string>
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index a1b9583a4..2bc963567 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -16,9 +16,7 @@
 #ifndef PKGLIB_DEBINDEXFILE_H
 #define PKGLIB_DEBINDEXFILE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/debindexfile.h"
-#endif
+
 
 #include <apt-pkg/indexfile.h>
 
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 2b9922987..c021a1b5a 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -2,10 +2,6 @@
 #ifndef PKGLIB_DEBMETAINDEX_H
 #define PKGLIB_DEBMETAINDEX_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/debmetaindex.h"
-#endif
-
 #include <apt-pkg/metaindex.h>
 #include <apt-pkg/sourcelist.h>
 
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index efef2e588..3f1956164 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -14,10 +14,6 @@
 #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/tagfile.h>
 
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index f899993df..51e063812 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -11,9 +11,6 @@
 #ifndef PKGLIB_DEBSRCRECORDS_H
 #define PKGLIB_DEBSRCRECORDS_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/debsrcrecords.h"
-#endif 
 
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/tagfile.h>
diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index 84e57e74a..5f9995e5d 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -10,10 +10,6 @@
 #ifndef PKGLIB_DEBSYSTEM_H
 #define PKGLIB_DEBSYSTEM_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/debsystem.h"
-#endif
-
 #include <apt-pkg/pkgsystem.h>
 
 class debStatusIndex;
diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 00a8832a8..56fb67887 100644
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -12,9 +12,7 @@
 #ifndef PKGLIB_DEBVERSION_H
 #define PKGLIB_DEBVERSION_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/debversion.h"
-#endif 
+
 
 #include <apt-pkg/version.h>
     
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 2ff8a9ac7..45eb6b15b 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -10,10 +10,6 @@
 #ifndef PKGLIB_DPKGPM_H
 #define PKGLIB_DPKGPM_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/dpkgpm.h"
-#endif
-
 #include <apt-pkg/packagemanager.h>
 #include <vector>
 #include <stdio.h>
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 58d1d25e5..70bc9f086 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -8,9 +8,6 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/depcache.h"
-#endif
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/version.h>
 #include <apt-pkg/error.h>
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 6d51920e9..929fe93c9 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -38,9 +38,6 @@
 #ifndef PKGLIB_DEPCACHE_H
 #define PKGLIB_DEPCACHE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/depcache.h"
-#endif
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/progress.h>
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 61049f4bd..f1c0268b8 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -21,9 +21,6 @@
 #ifndef PKGLIB_INDEXFILE_H
 #define PKGLIB_INDEXFILE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/indexfile.h"
-#endif
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 414faceaa..73c8b4c02 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -6,7 +6,6 @@
 #define PKGLIB_INDEXRECORDS_H
 
 #ifdef __GNUG__
-#pragma interface "apt-pkg/indexrecords.h"
 #endif 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/fileutl.h>
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 8ebf23541..2b87d7da9 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -1,9 +1,6 @@
 #ifndef PKGLIB_METAINDEX_H
 #define PKGLIB_METAINDEX_H
 
-/* #ifdef __GNUG__ */
-/* #pragma interface "apt-pkg/metaindex.h" */
-/* #endif */
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index d13301bcf..bbceb3879 100644
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -16,9 +16,6 @@
 #ifndef PKGLIB_ORDERLIST_H
 #define PKGLIB_ORDERLIST_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/orderlist.h"
-#endif 
 
 #include <apt-pkg/pkgcache.h>
 
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index f64637d03..35cdca913 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -23,9 +23,6 @@
 #ifndef PKGLIB_PACKAGEMANAGER_H
 #define PKGLIB_PACKAGEMANAGER_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/packagemanager.h"
-#endif
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 9926befe9..5672e60a4 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -20,11 +20,6 @@
    ##################################################################### */
 									/*}}}*/
 // 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/version.h>
 #include <apt-pkg/error.h>
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 587d97534..8e7fc252c 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -19,9 +19,6 @@
 #ifndef PKGLIB_PKGCACHE_H
 #define PKGLIB_PKGCACHE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgcache.h"
-#endif 
 
 #include <string>
 #include <time.h>
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 9a729eea4..70616c0a8 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -19,9 +19,6 @@
 #ifndef PKGLIB_PKGCACHEGEN_H
 #define PKGLIB_PKGCACHEGEN_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgcachegen.h"
-#endif 
 
 #include <apt-pkg/pkgcache.h>
 
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 08f004414..d431101fe 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -17,9 +17,6 @@
 #ifndef PKGLIB_PKGRECORDS_H
 #define PKGLIB_PKGRECORDS_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgrecords.h"
-#endif 
 
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/fileutl.h>
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index a7d555140..246762e0b 100644
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -37,9 +37,6 @@
 #ifndef PKGLIB_PKGSYSTEM_H
 #define PKGLIB_PKGSYSTEM_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/pkgsystem.h"
-#endif
 
 #include <apt-pkg/depcache.h>
 #include <vector>
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 40ebd3f70..d5f3b2f75 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -33,9 +33,6 @@
 #ifndef PKGLIB_POLICY_H
 #define PKGLIB_POLICY_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/policy.h"
-#endif
 
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/versionmatch.h>
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 123ae6984..b9e4389ed 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -35,9 +35,6 @@
 using std::string;
 using std::vector;
     
-#ifdef __GNUG__
-#pragma interface "apt-pkg/sourcelist.h"
-#endif
 
 class pkgAquire;
 class pkgSourceList
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index 3e2112549..99cbc6060 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -13,9 +13,6 @@
 #ifndef PKGLIB_SRCRECORDS_H
 #define PKGLIB_SRCRECORDS_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/srcrecords.h"
-#endif 
 
 #include <string>
 #include <vector>    
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 70381ad13..05c6aa701 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,9 +20,6 @@
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/tagfile.h"
-#endif 
 
 #include <apt-pkg/fileutl.h>
 #include <stdio.h>
diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
index 033bb96e8..2d39fd15f 100644
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -4,9 +4,6 @@
 #include <vector>
 #include <map>
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/vendor.h"
-#endif
 
 using std::string;
 
diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index 7f96fc766..ff2f4ed5d 100644
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -21,9 +21,6 @@
 using std::string;
 using std::vector;
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/vendorlist.h"
-#endif
 
 class pkgVendorList
 {
diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 071dba3e2..49c53a93a 100644
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -20,9 +20,6 @@
 #ifndef PKGLIB_VERSION_H
 #define PKGLIB_VERSION_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/version.h"
-#endif 
 
 #include <apt-pkg/strutl.h>    
 #include <string>
diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index 7ca39cbe8..fe264aa46 100644
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -31,9 +31,6 @@
 #ifndef PKGLIB_VERSIONMATCH_H
 #define PKGLIB_VERSIONMATCH_H
 
-#ifdef __GNUG__
-#pragma interface "apt-pkg/versionmatch.h"
-#endif
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
diff --git a/debian/changelog b/debian/changelog
index 6b842898c..6aaa473d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ apt (0.6.46.1) unstable; urgency=low
   * make the internal buffer in pkgTagFile grow dynamically
     (closes: #388708)
   
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  2 Oct 2006 16:02:30 +0200
 
 apt (0.6.46) unstable; urgency=low
 
diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h
index c364d670e..60bfc5408 100644
--- a/ftparchive/apt-ftparchive.h
+++ b/ftparchive/apt-ftparchive.h
@@ -14,7 +14,6 @@
 #define APT_FTPARCHIVE_H
 
 #ifdef __GNUG__
-#pragma interface "apt-ftparchive.h"
 #endif
 
 #include <fstream>
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index afa22213a..c10f41ecc 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -12,9 +12,7 @@
 #ifndef CACHEDB_H
 #define CACHEDB_H
 
-#ifdef __GNUG__
-#pragma interface "cachedb.h"
-#endif 
+
 
 #include <db.h>
 #include <string>
diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index 444d8626f..a65077e73 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -16,9 +16,7 @@
 #ifndef MULTICOMPRESS_H
 #define MULTICOMPRESS_H
 
-#ifdef __GNUG__
-#pragma interface "multicompress.h"
-#endif 
+
 
 #include <string>
 #include <apt-pkg/fileutl.h>
diff --git a/ftparchive/override.h b/ftparchive/override.h
index e64641776..f270556eb 100644
--- a/ftparchive/override.h
+++ b/ftparchive/override.h
@@ -12,9 +12,7 @@
 #ifndef OVERRIDE_H
 #define OVERRIDE_H
 
-#ifdef __GNUG__
-#pragma interface "override.h"
-#endif
+
 
 #include <map>
 #include <string>
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 1d47d57ec..7ae1cd587 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -14,7 +14,6 @@
 #define WRITER_H
 
 #ifdef __GNUG__
-#pragma interface "writer.h"
 #endif 
 
 #include <string>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 352f2f5a6..4c354136a 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-12 11:18+0200\n"
+"POT-Creation-Date: 2006-10-02 15:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1490,12 +1490,12 @@ msgstr ""
 msgid "File not found"
 msgstr ""
 
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:134
-#: methods/gzip.cc:143
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:140
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1742,12 +1742,12 @@ msgid ""
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:57
+#: methods/gzip.cc:64
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr ""
 
-#: methods/gzip.cc:102
+#: methods/gzip.cc:109
 #, c-format
 msgid "Read error from %s process"
 msgstr ""
@@ -2031,93 +2031,93 @@ msgstr ""
 msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:126
+#: apt-pkg/pkgcache.cc:121
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:127
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:132
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:137
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:147
+#: apt-pkg/pkgcache.cc:142
 msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:213
 msgid "Depends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:213
 msgid "PreDepends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:213
 msgid "Suggests"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:214
 msgid "Recommends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:214
 msgid "Conflicts"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:214
 msgid "Replaces"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:220
+#: apt-pkg/pkgcache.cc:215
 msgid "Obsoletes"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:226
 msgid "important"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:226
 msgid "required"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:226
 msgid "standard"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:227
 msgid "optional"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:227
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:58 apt-pkg/depcache.cc:87
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:62
+#: apt-pkg/depcache.cc:59
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:91
+#: apt-pkg/depcache.cc:88
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
+#: apt-pkg/tagfile.cc:106
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:186
+#: apt-pkg/tagfile.cc:193
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""