tags 339147 patch thanks As this bug is holding up a number of other packages for the (hopefully final) C++ ABI transition, I have prepared an NMU to fix it. Please find the patch attached.
I know that the allocator ABI change means that, in spite of past efforts to have the full ABI reflected in the apt library sonames, this NMU would provide a libapt-pkg-libc6.3-6.so.3.10 with a different ABI from previous versions. If this is not acceptable, please suggest a solution you would prefer, or supersede this NMU with a maintainer version. In the meantime, this NMU will be uploaded to the DELAYED/4-day queue on gluck. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -Nru /var/tmp/8VhF97cSNZ/apt-0.6.42.3/configure
/var/tmp/bh1eUJHVgw/apt-0.6.42.3/configure
--- /var/tmp/8VhF97cSNZ/apt-0.6.42.3/configure 2005-11-09 19:36:50.000000000
-0800
+++ /var/tmp/bh1eUJHVgw/apt-0.6.42.3/configure 2005-11-27 03:00:05.000000000
-0800
@@ -1347,7 +1347,7 @@
cat >>confdefs.h <<_ACEOF
-#define VERSION "0.6.42.3"
+#define VERSION "0.6.42.3-0.1"
_ACEOF
PACKAGE="apt"
diff -Nru /var/tmp/8VhF97cSNZ/apt-0.6.42.3/configure.in
/var/tmp/bh1eUJHVgw/apt-0.6.42.3/configure.in
--- /var/tmp/8VhF97cSNZ/apt-0.6.42.3/configure.in 2005-11-08
20:56:21.000000000 -0800
+++ /var/tmp/bh1eUJHVgw/apt-0.6.42.3/configure.in 2005-11-27
02:59:55.000000000 -0800
@@ -18,7 +18,7 @@
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in
include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3-0.1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff -Nru /var/tmp/8VhF97cSNZ/apt-0.6.42.3/debian/changelog
/var/tmp/bh1eUJHVgw/apt-0.6.42.3/debian/changelog
--- /var/tmp/8VhF97cSNZ/apt-0.6.42.3/debian/changelog 2005-11-09
11:50:35.000000000 -0800
+++ /var/tmp/bh1eUJHVgw/apt-0.6.42.3/debian/changelog 2005-11-27
02:45:50.000000000 -0800
@@ -1,3 +1,13 @@
+apt (0.6.42.3-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfix.
+ * Rebuild with g++-4.0 (>= 4.0.2-4) for the libstdc++ mt allocator ABI
+ change. Rename the libapt-pkg-libc6.3-6-3.10 virtual package to
+ libapt-pkg-libc6.3-6-3.10c2a accordingly. Closes: #339147.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sun, 27 Nov 2005 02:33:58 -0800
+
apt (0.6.42.3) unstable; urgency=low
* Merge [EMAIL PROTECTED]/apt--main--0 up to patch-129:
diff -Nru /var/tmp/8VhF97cSNZ/apt-0.6.42.3/debian/rules
/var/tmp/bh1eUJHVgw/apt-0.6.42.3/debian/rules
--- /var/tmp/8VhF97cSNZ/apt-0.6.42.3/debian/rules 2005-10-19
12:19:09.000000000 -0700
+++ /var/tmp/bh1eUJHVgw/apt-0.6.42.3/debian/rules 2005-11-27
02:59:13.000000000 -0800
@@ -76,10 +76,12 @@
# Find the libapt-pkg major version for use in other control files
export LIBAPTPKG_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '='
-f 2)
export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '='
-f 2)
+# ABI change without libstdc++ ABI change :/
+export CPPABI:=c2a
# Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR)
+LIBAPTPKG_PROVIDE=libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR)$(CPPABI)
+LIBAPTINST_PROVIDE=libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR)$(CPPABI)
debian/shlibs.local: apt-pkg/makefile
# We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
signature.asc
Description: Digital signature
