Bug#791221: octomap: library transition may be needed when GCC 5 is the default -- patch, NMU
Martin Pitt
mpitt at debian.org
Wed Aug 5 13:55:28 UTC 2015
tag 791221 patch pending
user release.debian.org at packages.debian.org
usertag 791221 + transition
block 791221 by 790756
Hello,
attached debdiff does the renaming. I NMUed this to DELAYED/2 as per
current g++ transition exception.
Note that libdynamicedt3d1.6 apparently does not change any symbols
with g++ 5, so this one does not need to be renamed.
Martin
--
Martin Pitt | http://www.piware.de
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
-------------- next part --------------
diff -Nru octomap-1.6.8+dfsg/debian/changelog octomap-1.6.8+dfsg/debian/changelog
--- octomap-1.6.8+dfsg/debian/changelog 2015-06-30 22:36:13.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/changelog 2015-08-05 15:36:53.000000000 +0200
@@ -1,3 +1,10 @@
+octomap (1.6.8+dfsg-2.1) unstable; urgency=medium
+
+ * Rename library packages for g++5 ABI transition. (Closes: #791221)
+ * debian/rules: Fix paths according to previous renames.
+
+ -- Martin Pitt <mpitt at debian.org> Wed, 05 Aug 2015 15:36:45 +0200
+
octomap (1.6.8+dfsg-2) unstable; urgency=medium
* Team upload.
diff -Nru octomap-1.6.8+dfsg/debian/control octomap-1.6.8+dfsg/debian/control
--- octomap-1.6.8+dfsg/debian/control 2015-06-26 08:49:08.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/control 2015-08-05 15:49:08.000000000 +0200
@@ -9,9 +9,11 @@
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/octomap.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/octomap.git
-Package: liboctomap1.6
+Package: liboctomap1.6v5
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: liboctomap1.6
+Replaces: liboctomap1.6
Description: 3D occupancy grid mapping approach library for mapping
The OctoMap library implements a 3D occupancy grid mapping approach,
providing data structures and mapping algorithms in C++ particularly suited
@@ -32,7 +34,7 @@
Package: liboctomap-dev
Architecture: any
Section: libdevel
-Depends: liboctomap1.6 (= ${binary:Version}),
+Depends: liboctomap1.6v5 (= ${binary:Version}),
${misc:Depends}
Description: Octomap library development files
The OctoMap library implements a 3D occupancy grid mapping approach,
@@ -42,12 +44,14 @@
Compact. This package contains the development stuff.
-Package: liboctomap1.6-dbg
+Package: liboctomap1.6v5-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: liboctomap1.6 (= ${binary:Version}),
+Depends: liboctomap1.6v5 (= ${binary:Version}),
${misc:Depends}
+Conflicts: liboctomap1.6-dbg
+Replaces: liboctomap1.6-dbg
Description: Octomap library debug development files
The OctoMap library implements a 3D occupancy grid mapping approach,
providing data structures and mapping algorithms in C++ particularly suited
@@ -90,9 +94,11 @@
library to propagate changes to the EDT. This package contains the development
debug info.
-Package: liboctovis1.6
+Package: liboctovis1.6v5
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: liboctovis1.6
+Replaces: liboctovis1.6
Description: Visualization library for OctoMap
Visualization library for the OctoMap library based on Qt and libQGLViewer.
This library encapsulates the functions to view a Octomap octrees. It
@@ -101,26 +107,28 @@
Package: liboctovis-dev
Architecture: any
Section: libdevel
-Depends: liboctovis1.6 (= ${binary:Version}),
+Depends: liboctovis1.6v5 (= ${binary:Version}),
${misc:Depends}
Description: Visualization library for OctoMap development files
Visualization library for the OctoMap library based on Qt and libQGLViewer.
This library encapsulates the functions to view a Octomap octrees. This package
contains the development files.
-Package: liboctovis1.6-dbg
+Package: liboctovis1.6v5-dbg
Architecture: any
Priority: extra
Section: debug
-Depends: liboctovis1.6 (= ${binary:Version}),
+Depends: liboctovis1.6v5 (= ${binary:Version}),
${misc:Depends}
+Conflicts: liboctovis1.6-dbg
+Replaces: liboctovis1.6-dbg
Description: Visualization library for OctoMap - debug files
Visualization library for the OctoMap library based on Qt and libQGLViewer.
This package contains the debug development files.
Package: octovis
Architecture: any
-Depends: liboctovis1.6 (= ${binary:Version}),
+Depends: liboctovis1.6v5 (= ${binary:Version}),
${misc:Depends}, ${shlibs:Depends},
libqglviewer2
Description: Visualization tool for OctoMap
diff -Nru octomap-1.6.8+dfsg/debian/liboctomap1.6-dbg.install octomap-1.6.8+dfsg/debian/liboctomap1.6-dbg.install
--- octomap-1.6.8+dfsg/debian/liboctomap1.6-dbg.install 2015-06-30 22:33:34.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/liboctomap1.6-dbg.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/liboctomap1.6-dbg/*
diff -Nru octomap-1.6.8+dfsg/debian/liboctomap1.6-dbg.links octomap-1.6.8+dfsg/debian/liboctomap1.6-dbg.links
--- octomap-1.6.8+dfsg/debian/liboctomap1.6-dbg.links 2015-06-30 22:33:34.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/liboctomap1.6-dbg.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/share/doc/liboctomap1.6/changelog.gz /usr/share/doc/liboctomap1.6-dbg/changelog.gz
diff -Nru octomap-1.6.8+dfsg/debian/liboctomap1.6.install octomap-1.6.8+dfsg/debian/liboctomap1.6.install
--- octomap-1.6.8+dfsg/debian/liboctomap1.6.install 2015-06-30 22:33:34.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/liboctomap1.6.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/lib/liboctomap.so.*
-usr/lib/liboctomath.so.*
-usr/share/doc/liboctomap1.6
diff -Nru octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.install octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.install
--- octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.install 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.install 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1 @@
+usr/share/doc/liboctomap1.6v5-dbg/*
diff -Nru octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.links octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.links
--- octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.links 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.links 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1 @@
+/usr/share/doc/liboctomap1.6/changelog.gz /usr/share/doc/liboctomap1.6v5-dbg/changelog.gz
diff -Nru octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.lintian-overrides octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.lintian-overrides
--- octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctomap1.6v5-dbg.lintian-overrides 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+liboctomap1.6v5-dbg: package-name-doesnt-match-sonames liboctomap1.6-dbg
diff -Nru octomap-1.6.8+dfsg/debian/liboctomap1.6v5.install octomap-1.6.8+dfsg/debian/liboctomap1.6v5.install
--- octomap-1.6.8+dfsg/debian/liboctomap1.6v5.install 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctomap1.6v5.install 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1,3 @@
+usr/lib/liboctomap.so.*
+usr/lib/liboctomath.so.*
+usr/share/doc/liboctomap1.6v5
diff -Nru octomap-1.6.8+dfsg/debian/liboctomap1.6v5.lintian-overrides octomap-1.6.8+dfsg/debian/liboctomap1.6v5.lintian-overrides
--- octomap-1.6.8+dfsg/debian/liboctomap1.6v5.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctomap1.6v5.lintian-overrides 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+liboctomap1.6v5: package-name-doesnt-match-sonames liboctomap1.6
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.install octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.install
--- octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.install 2015-06-30 22:33:34.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/liboctovis1.6-dbg/*
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.links octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.links
--- octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.links 2015-06-30 22:33:34.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/share/doc/liboctomap1.6/changelog.gz /usr/share/doc/liboctovis1.6-dbg/changelog.gz
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.lintian-overrides octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.lintian-overrides
--- octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.lintian-overrides 2015-06-30 22:33:34.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6-dbg.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-# This source package is just dfsg. However, it has embed
-# the QGLViewer sources in a src directory. So, using a size criteria, we have
-# repackaged this sources deleting the QGLViewer part and renaming it with
-# dsfg suffix.
-
-octomap source: debian-watch-file-should-dversionmangle-not-uversionmangle line 8
-
-##
-# Lintian false-positive, link destination not in this package.
-liboctovis1.6-dbg: package-contains-broken-symlink usr/share/doc/liboctovis1.6-dbg/changelog.gz ../liboctomap1.6/changelog.gz
-
-
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6.install octomap-1.6.8+dfsg/debian/liboctovis1.6.install
--- octomap-1.6.8+dfsg/debian/liboctovis1.6.install 2015-06-30 22:33:34.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/liboctovis.so.*
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.install octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.install
--- octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.install 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.install 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1 @@
+usr/share/doc/liboctovis1.6v5-dbg/*
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.links octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.links
--- octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.links 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.links 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1 @@
+/usr/share/doc/liboctomap1.6/changelog.gz /usr/share/doc/liboctovis1.6v5-dbg/changelog.gz
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.lintian-overrides octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.lintian-overrides
--- octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6v5-dbg.lintian-overrides 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1,14 @@
+# This source package is just dfsg. However, it has embed
+# the QGLViewer sources in a src directory. So, using a size criteria, we have
+# repackaged this sources deleting the QGLViewer part and renaming it with
+# dsfg suffix.
+
+octomap source: debian-watch-file-should-dversionmangle-not-uversionmangle line 8
+
+##
+# Lintian false-positive, link destination not in this package.
+liboctovis1.6v5-dbg: package-contains-broken-symlink usr/share/doc/liboctovis1.6v5-dbg/changelog.gz ../liboctomap1.6/changelog.gz
+
+
+# G++5 ABI transition
+liboctovis1.6v5-dbg: package-name-doesnt-match-sonames liboctovis1.6-dbg
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6v5.install octomap-1.6.8+dfsg/debian/liboctovis1.6v5.install
--- octomap-1.6.8+dfsg/debian/liboctovis1.6v5.install 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6v5.install 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/liboctovis.so.*
diff -Nru octomap-1.6.8+dfsg/debian/liboctovis1.6v5.lintian-overrides octomap-1.6.8+dfsg/debian/liboctovis1.6v5.lintian-overrides
--- octomap-1.6.8+dfsg/debian/liboctovis1.6v5.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ octomap-1.6.8+dfsg/debian/liboctovis1.6v5.lintian-overrides 2015-08-04 12:32:50.000000000 +0200
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+liboctovis1.6v5: package-name-doesnt-match-sonames liboctovis1.6
diff -Nru octomap-1.6.8+dfsg/debian/rules octomap-1.6.8+dfsg/debian/rules
--- octomap-1.6.8+dfsg/debian/rules 2015-06-30 22:33:34.000000000 +0200
+++ octomap-1.6.8+dfsg/debian/rules 2015-08-05 15:18:28.000000000 +0200
@@ -46,11 +46,11 @@
dh_auto_install --builddirectory=build
override_dh_install:
- mkdir -p debian/tmp/usr/share/doc/liboctomap1.6-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/liboctomap1.6-dbg/
- mkdir -p debian/tmp/usr/share/doc/liboctovis1.6-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/liboctovis1.6-dbg/
+ mkdir -p debian/tmp/usr/share/doc/liboctomap1.6v5-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/liboctomap1.6v5-dbg/
+ mkdir -p debian/tmp/usr/share/doc/liboctovis1.6v5-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/liboctovis1.6v5-dbg/
mkdir -p debian/tmp/usr/share/doc/libdynamicedt3d1.6-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/libdynamicedt3d1.6-dbg/
- mkdir -p debian/tmp/usr/share/doc/liboctomap1.6 debian/tmp/usr/share/doc/libdynamicedt3d1.6
- gzip -n -c -9 octomap/CHANGELOG.txt > debian/tmp/usr/share/doc/liboctomap1.6/changelog.gz
+ mkdir -p debian/tmp/usr/share/doc/liboctomap1.6v5 debian/tmp/usr/share/doc/libdynamicedt3d1.6
+ gzip -n -c -9 octomap/CHANGELOG.txt > debian/tmp/usr/share/doc/liboctomap1.6v5/changelog.gz
gzip -n -c -9 dynamicEDT3D/CHANGELOG.txt > debian/tmp/usr/share/doc/libdynamicedt3d1.6/changelog.gz
dh_install --list-missing
@@ -58,17 +58,17 @@
echo "Supressing upstream tests"
override_dh_installdocs:
- dh_installdocs -pliboctovis-dev --link-doc=liboctomap1.6
- dh_installdocs -poctomap-tools --link-doc=liboctomap1.6
- dh_installdocs -pliboctovis1.6 --link-doc=liboctomap1.6
- dh_installdocs -poctovis --link-doc=liboctomap1.6
- dh_installdocs -pliboctomap-dev --link-doc=liboctomap1.6
+ dh_installdocs -pliboctovis-dev --link-doc=liboctomap1.6v5
+ dh_installdocs -poctomap-tools --link-doc=liboctomap1.6v5
+ dh_installdocs -pliboctovis1.6 --link-doc=liboctomap1.6v5
+ dh_installdocs -poctovis --link-doc=liboctomap1.6v5
+ dh_installdocs -pliboctomap-dev --link-doc=liboctomap1.6v5
dh_installdocs -plibdynamicedt3d-dev --link-doc=libdynamicedt3d1.6
dh_installdocs
override_dh_strip:
- dh_strip -pliboctomap1.6 --dbg-package=liboctomap1.6-dbg
- dh_strip -pliboctovis1.6 --dbg-package=liboctovis1.6-dbg
+ dh_strip -pliboctomap1.6v5 --dbg-package=liboctomap1.6v5-dbg
+ dh_strip -pliboctovis1.6v5 --dbg-package=liboctovis1.6v5-dbg
dh_strip -plibdynamicedt3d1.6 --dbg-package=libdynamicedt3d1.6-dbg
dh_strip -poctomap-tools
dh_strip -poctovis
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/debian-science-maintainers/attachments/20150805/16c465d8/attachment.sig>
More information about the debian-science-maintainers
mailing list