Control: tag 791111 pending Control: tag 735219 pending Martin Pitt [2015-08-05 9:45 +0200]: > this is the debdiff we uploaded to Ubuntu that does the renaming.
As per current g++5 exception I NMUed this to DELAYED/2-day with the attached patch. While I was at it I also applied the FTBFS fix for ppc64el in #735219. Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
diff -Nru libcoyotl-3.1.0/debian/changelog libcoyotl-3.1.0/debian/changelog
--- libcoyotl-3.1.0/debian/changelog 2012-07-07 02:20:02.000000000 +0200
+++ libcoyotl-3.1.0/debian/changelog 2015-08-05 11:53:10.000000000 +0200
@@ -1,3 +1,12 @@
+libcoyotl (3.1.0-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use dh-autoreconf to get new libtool macros for ppc64el. (Closes: #735219)
+ * Remove config.{sub,guess} logic in d/rules, as autoreconf does this.
+ * Rename library packages for g++5 ABI transition. (Closes: #791111)
+
+ -- Martin Pitt <[email protected]> Wed, 05 Aug 2015 11:51:01 +0200
+
libcoyotl (3.1.0-6) unstable; urgency=low
* Updated Standards-Version
diff -Nru libcoyotl-3.1.0/debian/control libcoyotl-3.1.0/debian/control
--- libcoyotl-3.1.0/debian/control 2012-07-07 02:20:02.000000000 +0200
+++ libcoyotl-3.1.0/debian/control 2015-08-05 11:52:21.000000000 +0200
@@ -2,13 +2,13 @@
Section: libs
Priority: optional
Maintainer: Al Stone <[email protected]>
-Build-Depends: debhelper (>= 8.0.0), libpng-dev, doxygen
+Build-Depends: debhelper (>= 8.0.0), libpng-dev, doxygen, dh-autoreconf
Standards-Version: 3.9.3
Package: libcoyotl-dev
Section: libdevel
Architecture: any
-Depends: libcoyotl-3.1-4 (= ${binary:Version}), ${misc:Depends}
+Depends: libcoyotl-3.1-4v5 (= ${binary:Version}), ${misc:Depends}
Description: portable C++ classes used by acovea -- development files
This package provides the files needed to develop code that uses the
libcoyotl library.
@@ -39,11 +39,11 @@
- validation tools for "Design by Contract" programming.
-Package: libcoyotl-3.1-4
+Package: libcoyotl-3.1-4v5
Section: libs
Architecture: any
-Conflicts: libcoyotl3c2
-Replaces: libcoyotl3c2
+Conflicts: libcoyotl-3.1-4, libcoyotl3c2
+Replaces: libcoyotl-3.1-4, libcoyotl3c2
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: portable C++ classes used by acovea
The classes provided here do not easily fit into a single category; in
diff -Nru libcoyotl-3.1.0/debian/libcoyotl-3.1-4.dirs
libcoyotl-3.1.0/debian/libcoyotl-3.1-4.dirs
--- libcoyotl-3.1.0/debian/libcoyotl-3.1-4.dirs 2012-07-07 02:20:02.000000000
+0200
+++ libcoyotl-3.1.0/debian/libcoyotl-3.1-4.dirs 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-usr/lib
diff -Nru libcoyotl-3.1.0/debian/libcoyotl-3.1-4.install
libcoyotl-3.1.0/debian/libcoyotl-3.1-4.install
--- libcoyotl-3.1.0/debian/libcoyotl-3.1-4.install 2012-07-07
02:20:02.000000000 +0200
+++ libcoyotl-3.1.0/debian/libcoyotl-3.1-4.install 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/lib*.so.* usr/lib
-debian/shlibs DEBIAN
diff -Nru libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.dirs
libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.dirs
--- libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.dirs 1970-01-01
01:00:00.000000000 +0100
+++ libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.dirs 2015-08-05
11:49:57.000000000 +0200
@@ -0,0 +1 @@
+usr/lib
diff -Nru libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.install
libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.install
--- libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.install 1970-01-01
01:00:00.000000000 +0100
+++ libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.install 2015-08-05
11:49:57.000000000 +0200
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/lib*.so.* usr/lib
+debian/shlibs DEBIAN
diff -Nru libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.lintian-overrides
libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.lintian-overrides
--- libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.lintian-overrides 1970-01-01
01:00:00.000000000 +0100
+++ libcoyotl-3.1.0/debian/libcoyotl-3.1-4v5.lintian-overrides 2015-08-05
11:49:57.000000000 +0200
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libcoyotl-3.1-4v5: package-name-doesnt-match-sonames libcoyotl-3.1-4
diff -Nru libcoyotl-3.1.0/debian/rules libcoyotl-3.1.0/debian/rules
--- libcoyotl-3.1.0/debian/rules 2012-07-07 02:20:02.000000000 +0200
+++ libcoyotl-3.1.0/debian/rules 2015-08-05 11:52:21.000000000 +0200
@@ -43,6 +43,7 @@
config.status: configure-stamp
configure-stamp:
dh_testdir
+ dh_autoreconf
# Add here commands to configure the package.
LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
@@ -68,15 +69,7 @@
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
+ dh_autoreconf_clean
dh_clean
install: build
@@ -123,10 +116,10 @@
# dh_perl
# dh_python
dh_installdeb
- install -m644 debian/shlibs debian/libcoyotl-3.1-4/DEBIAN
+ install -m644 debian/shlibs debian/libcoyotl-3.1-4v5/DEBIAN
rm -f debian/libcoyotl-dev/DEBIAN/shlibs
sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
- dh_shlibdeps -plibcoyotl-3.1-4
+ dh_shlibdeps -plibcoyotl-3.1-4v5
dh_shlibdeps -plibcoyotl-dev
dh_gencontrol
dh_md5sums
diff -Nru libcoyotl-3.1.0/debian/shlibs libcoyotl-3.1.0/debian/shlibs
--- libcoyotl-3.1.0/debian/shlibs 2012-07-07 02:20:02.000000000 +0200
+++ libcoyotl-3.1.0/debian/shlibs 2015-08-05 11:49:57.000000000 +0200
@@ -1 +1 @@
-libcoyotl-3.1 4 libcoyotl-3.1-4
+libcoyotl-3.1 4 libcoyotl-3.1-4v5
signature.asc
Description: Digital signature
