remove old APT_COMPATIBILITY ifdef's

diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index 859ff6b6d519d2a558cc8b5da8397800435d071b..bc9e13d92958f93754a2e1160babcd85869fe27a 100644 (file)
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -10,7 +10,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#define APT_COMPATIBILITY 986
 #include <config.h>
 
 #include <apt-pkg/debversion.h>

diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 24ad73149c186a549845cd3b1b7202b42b69e80e..f1d6f3cc55df54fb25836190de6c89d84e1331d6 100644 (file)
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -39,32 +39,4 @@ class debVersioningSystem : public pkgVersioningSystem
 
 extern debVersioningSystem debVS;
 
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-
-inline int pkgVersionCompare(const char *A, const char *B)
-{
-   return debVS.CmpVersion(A,B);
-}
-inline int pkgVersionCompare(const char *A, const char *AEnd, 
-                            const char *B, const char *BEnd)
-{
-   return debVS.DoCmpVersion(A,AEnd,B,BEnd);
-}
-inline int pkgVersionCompare(std::string A,std::string B)
-{
-   return debVS.CmpVersion(A,B);
-}
-inline bool pkgCheckDep(const char *DepVer,const char *PkgVer,int Op)
-{
-   return debVS.CheckDep(PkgVer,Op,DepVer);
-}
-inline std::string pkgBaseVersion(const char *Ver)
-{
-   return debVS.UpstreamVersion(Ver);
-}
-#endif
-
 #endif

diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index 85ad0df7e43446e5f864dbe9bad1fe79480069af..0c1c7ae5a8b0d4ee9d780805be7176dc6fea56e6 100644 (file)
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -31,15 +31,4 @@ extern const char *pkgLibVersion;
 bool pkgInitConfig(Configuration &Cnf);
 bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys);
 
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-
-inline bool pkgInitialize(Configuration &Cnf) 
-{
-   return pkgInitConfig(Cnf) && pkgInitSystem(Cnf,_system);
-};
-#endif
-
 #endif

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 1356054b5b7afc3b761348f5590873c7b251ed27..f7e01f60b12c873fa0f3721633edf394199ac046 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -10,7 +10,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#define APT_COMPATIBILITY 986
 #include <config.h>
 
 #include <apt-pkg/pkgcachegen.h>

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index af9c2bcb048a57acc77269ab1309b2a65ded9ff2..b381fa9a34e98723164cac45548939aacba1eb22 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -164,18 +164,4 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
                        MMap **OutMap = 0,bool AllowMem = false);
 bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap);
 
-
-#ifdef APT_COMPATIBILITY
-#if APT_COMPATIBILITY != 986
-#warning "Using APT_COMPATIBILITY"
-#endif
-MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress)
-{
-   MMap *Map = 0;
-   if (pkgCacheGenerator::MakeStatusCache(List,&Progress,&Map,true) == false)
-      return 0;
-   return Map;
-}
-#endif
-
 #endif

diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index 47e1919bbfce4473fd98448c1eab0049089ed302..92dbc2576732edde7bd8c17bdf3375f000b8c185 100644 (file)
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -54,8 +54,4 @@ class pkgVersioningSystem
    virtual ~pkgVersioningSystem() {};
 };
 
-#ifdef APT_COMPATIBILITY
-#include <apt-pkg/debversion.h>
-#endif
-
 #endif

diff --git a/debian/changelog b/debian/changelog
index aa98cfbd10760fad24d429714c17a46de96e6b31..5d5373ed022cd756f468dc6ec2e0c87abf077db5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ apt (0.8.16~exp7) experimental; urgency=low
   [ David Kalnischkies ]
   * do not pollute namespace in the headers with using (Closes: #500198)
   * use forward declaration in headers if possible instead of includes
+  * remove old APT_COMPATIBILITY ifdef's
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 19 Sep 2011 19:13:48 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 19 Sep 2011 19:24:20 +0200
 
 apt (0.8.16~exp6) experimental; urgency=low