From d57208f29aace3657c7c0835fdc477beba4c1f5b Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Mon, 27 Jul 2015 01:02:00 +0100 Subject: Transition to GCC5 C++11 ABI --- debian/changelog | 2 ++ debian/control | 8 +++++--- debian/libconfig++9.install | 1 - debian/libconfig++9v5.install | 1 + debian/rules | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 debian/libconfig++9.install create mode 100644 debian/libconfig++9v5.install diff --git a/debian/changelog b/debian/changelog index 8f44d92..078a8bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libconfig (1.5-1) UNRELEASED; urgency=medium * New upsteam release + * Transition to GCC5 C++11 ABI: + - libconfig++9 -> libconfig++9v5 * Split documentation build into -indep target (Closes: #759582) - Thanks to Pino Toscano for the patch * Enable parallel build (Closes: 759581) diff --git a/debian/control b/debian/control index 60f3368..c39f5ed 100644 --- a/debian/control +++ b/debian/control @@ -26,12 +26,14 @@ Description: parsing/manipulation of structured configuration files This library allows parsing, manipulating and writing structured configuration files. -Package: libconfig++9 +Package: libconfig++9v5 Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} +Breaks: libconfig++9 +Replaces: libconfig++9 Description: parsing/manipulation of structured configuration files (C++ binding) This library features a fully reentrant parser and includes bindings for both the C and C++ programming languages. It runs on modern POSIX-compliant @@ -85,7 +87,7 @@ Package: libconfig++-dev Architecture: any Multi-Arch: same Section: libdevel -Depends: libconfig++9 (= ${binary:Version}), +Depends: libconfig++9v5 (= ${binary:Version}), libconfig-dev, pkg-config, ${misc:Depends} @@ -143,7 +145,7 @@ Multi-Arch: same Section: debug Priority: extra Depends: libconfig9 (= ${binary:Version}), - libconfig++9 (= ${binary:Version}), + libconfig++9v5 (= ${binary:Version}), ${misc:Depends} Description: parsing/manipulation of structured config files (C++ debug symbols) This library features a fully reentrant parser and includes bindings for diff --git a/debian/libconfig++9.install b/debian/libconfig++9.install deleted file mode 100644 index f63c7e9..0000000 --- a/debian/libconfig++9.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/*/libconfig++.so.9* diff --git a/debian/libconfig++9v5.install b/debian/libconfig++9v5.install new file mode 100644 index 0000000..f63c7e9 --- /dev/null +++ b/debian/libconfig++9v5.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*/libconfig++.so.9* diff --git a/debian/rules b/debian/rules index 78649d6..0d6db96 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ override_dh_auto_build-indep: override_dh_strip: dh_strip -p libconfig9 --dbg-package=libconfig-dbg - dh_strip -p libconfig++9 --dbg-package=libconfig++-dbg + dh_strip -p libconfig++9v5 --dbg-package=libconfig++-dbg %: dh $@ --parallel --with autoreconf -- cgit v1.2.3