merge with my debian-sid branch

[apt.git] / apt-pkg / init.h

diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index f892e7ff458a426b36dddea7a7c85cae6a712593..0c1c7ae5a8b0d4ee9d780805be7176dc6fea56e6 100644 (file)
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -13,18 +13,16 @@
 #ifndef PKGLIB_INIT_H
 #define PKGLIB_INIT_H
 
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/pkgsystem.h>
+class pkgSystem;
+class Configuration;
 
 // These lines are extracted by the makefiles and the buildsystem
 // Increasing MAJOR or MINOR results in the need of recompiling all
 // reverse-dependencies of libapt-pkg against the new SONAME.
 // Non-ABI-Breaks should only increase RELEASE number.
 // See also buildlib/libversion.mak
-// FIXME: this needs to be changed to "4" (without quotes) on the next
-//        ABI break
-#define APT_PKG_MAJOR libc6.9-6-4
-#define APT_PKG_MINOR 8
+#define APT_PKG_MAJOR 4
+#define APT_PKG_MINOR 12
 #define APT_PKG_RELEASE 0
     
 extern const char *pkgVersion;
@@ -33,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