Bug#791011: nmu diff for console-bridge 0.2.5-2.1

Julien Cristau jcristau at debian.org
Mon Aug 17 19:04:35 UTC 2015


Dear maintainer,

I've prepared a NMU for console-bridge, to deal with the libstdc++ transition,
and will shortly upload it to the 1-day delayed queue.  Please find the
debdiff below.

Cheers,
Julien

>From 1e1c702b20a415c7360519ffcf44c03c0b089ebc Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau at debian.org>
Date: Sun, 16 Aug 2015 17:33:59 +0200
Subject: [PATCH] Rename library packages for g++5 ABI transition (closes:
 791011).

---
 debian/changelog                      |  7 +++++++
 debian/control                        | 12 ++++++++----
 debian/libconsole-bridge0.2.install   |  1 -
 debian/libconsole-bridge0.2v5.install |  1 +
 debian/rules                          |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 debian/libconsole-bridge0.2.install
 create mode 100644 debian/libconsole-bridge0.2v5.install

diff --git a/debian/changelog b/debian/changelog
index 5ffdec6..bf73156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+console-bridge (0.2.5-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++5 ABI transition (closes: 791011).
+
+ -- Julien Cristau <jcristau at debian.org>  Sun, 16 Aug 2015 17:33:59 +0200
+
 console-bridge (0.2.5-2) unstable; urgency=low
 
   * Remove symbols support
diff --git a/debian/control b/debian/control
index c3e824a..35ceb70 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,13 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/console-bridge.git
 Homepage: https://github.com/ros/console_bridge
 XS-Testsuite: autopkgtest
 
-Package: libconsole-bridge0.2
+Package: libconsole-bridge0.2v5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
+Conflicts: libconsole-bridge0.2
+Replaces: libconsole-bridge0.2
 Description: console bridge - library
  ROS-independent, pure CMake (i.e. non-catkin and non-rosbuild
  package) that provides logging calls that mirror those found in
@@ -30,7 +32,7 @@ Architecture: any
 Section: libdevel
 Depends: libboost-thread-dev,
 	 libboost-system-dev,
-	 libconsole-bridge0.2 (= ${binary:Version}),
+	 libconsole-bridge0.2v5 (= ${binary:Version}),
 	 pkg-config, ${misc:Depends}
 Multi-Arch: same
 Description: console bridge - development files
@@ -41,12 +43,14 @@ Description: console bridge - development files
  This package contains the development files (headers, pkg-config and
  CMake files).
 
-Package: libconsole-bridge0.2-dbg
+Package: libconsole-bridge0.2v5-dbg
 Architecture: any
 Section: debug
-Depends: libconsole-bridge0.2 (= ${binary:Version}),
+Depends: libconsole-bridge0.2v5 (= ${binary:Version}),
          ${misc:Depends}
 Multi-Arch: same
+Conflicts: libconsole-bridge0.2-dbg
+Replaces: libconsole-bridge0.2-dbg
 Description: console bridge - debugging symbols
  ROS-independent, pure CMake (i.e. non-catkin and non-rosbuild
  package) that provides logging calls that mirror those found in
diff --git a/debian/libconsole-bridge0.2.install b/debian/libconsole-bridge0.2.install
deleted file mode 100644
index 3de3b10..0000000
--- a/debian/libconsole-bridge0.2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*.so.*
diff --git a/debian/libconsole-bridge0.2v5.install b/debian/libconsole-bridge0.2v5.install
new file mode 100644
index 0000000..3de3b10
--- /dev/null
+++ b/debian/libconsole-bridge0.2v5.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/debian/rules b/debian/rules
index 928ebc0..aec1817 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,4 +12,4 @@ override_dh_auto_clean:
 	dh_auto_clean --
 
 override_dh_strip:
-	dh_strip -a --dbg-package=libconsole-bridge0.2-dbg
+	dh_strip -a --dbg-package=libconsole-bridge0.2v5-dbg
-- 
2.5.0



More information about the debian-science-maintainers mailing list