merged (and resolved a bunch of conflicts) of the debian-sid branch

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 4c15858a16e6b0b60cadd01a13f211cec8c8f2f3..4818174ac15d8a6a127f5a34b8d4b422d05b45f5 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -24,7 +24,7 @@
 
 #define Stringfy_(x) # x
 #define Stringfy(x)  Stringfy_(x)
 
 #define Stringfy_(x) # x
 #define Stringfy(x)  Stringfy_(x)

-const char *pkgVersion = VERSION;
+const char *pkgVersion = PACKAGE_VERSION;

 const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
                             Stringfy(APT_PKG_MINOR) "." 
                             Stringfy(APT_PKG_RELEASE);
 const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
                             Stringfy(APT_PKG_MINOR) "." 
                             Stringfy(APT_PKG_RELEASE);