fix test-failure in adt

[apt.git] / buildlib / libversion.mak

diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak
index 5585ab487b537180aab044f8be3f5bff0340d31c..deb3da377882a8ff835ff6ba1faa73c4f31dd8bc 100644 (file)
--- a/buildlib/libversion.mak
+++ b/buildlib/libversion.mak
@@ -2,9 +2,9 @@
 # Version number of libapt-pkg.
 # Please increase MAJOR with each ABI break,
 # with each non-ABI break to the lib, please increase RELEASE.
 # Version number of libapt-pkg.
 # Please increase MAJOR with each ABI break,
 # with each non-ABI break to the lib, please increase RELEASE.

-# The versionnumber is extracted from apt-pkg/init.h - see also there.
-LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/init.h | sed 's/\.$$//')
-LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/init.h | cut -d ' ' -f 3)
+# The versionnumber is extracted from apt-pkg/macros.h - see also there.
+LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/contrib/macros.h | sed 's/\.$$//')
+LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/contrib/macros.h | cut -d ' ' -f 3)

 
 # Version number of libapt-inst
 # Please increase MAJOR with each ABI break,
 
 # Version number of libapt-inst
 # Please increase MAJOR with each ABI break,


@@ -12,10 +12,3 @@ LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/in
 # The versionnumber is extracted from apt-inst/makefile - see also there.
 LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
 LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
 # The versionnumber is extracted from apt-inst/makefile - see also there.
 LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
 LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)

-
-# FIXME: In previous releases this lovely variable includes
-# the detected libc and libdc++ version. As this is bogus we
-# want to drop this, but this a ABI break.
-# And we don't want to do this now. So we hardcode a value here,
-# and drop it later on (hopefully as fast as possible).
-LIBEXT=-libc6.10-6