[Pkg-bitcoin-devel] Bug#791092: NMU: Bug#791092: libbitcoin: library transition may be needed when GCC 5 is the default

Martin Pitt mpitt at debian.org
Wed Aug 5 10:27:21 UTC 2015


Control: tag -1 pending

As per current g++ transition rules I NMUed this with 2-day delay with
attached debdiff.

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru libbitcoin-2.0/debian/changelog libbitcoin-2.0/debian/changelog
--- libbitcoin-2.0/debian/changelog	2014-11-21 22:44:56.000000000 +0100
+++ libbitcoin-2.0/debian/changelog	2015-08-05 12:16:47.000000000 +0200
@@ -1,3 +1,12 @@
+libbitcoin (2.0-2.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++5 ABI transition and adjust "abi" in
+    debian/rules. (Closes: #791092)
+  * Add missing-include.patch: Fix FTBFS due to unknown std::cout.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 05 Aug 2015 06:56:38 +0200
+
 libbitcoin (2.0-2.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libbitcoin-2.0/debian/control libbitcoin-2.0/debian/control
--- libbitcoin-2.0/debian/control	2014-08-15 13:41:48.000000000 +0200
+++ libbitcoin-2.0/debian/control	2015-08-05 12:15:33.000000000 +0200
@@ -23,14 +23,15 @@
  libregexp-assemble-perl,
  libimage-exiftool-perl,
  libfont-ttf-perl
-Maintainer: Debian Bitcoin Team <pkg-bitcoin-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Bitcoin Team <pkg-bitcoin-devel at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
 Standards-Version: 3.9.5
 Homepage: https://libbitcoin.org/
 Vcs-Git: git://git.debian.org/pkg-bitcoin/libbitcoin.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-bitcoin/libbitcoin.git
 
-Package: libbitcoin0
+Package: libbitcoin0v5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -38,6 +39,8 @@
 Pre-Depends: ${misc:Pre-Depends},
  ${cdbs:Pre-Depends}
 Multi-Arch: same
+Conflicts: libbitcoin0
+Replaces: libbitcoin0
 Description: Bitcoin toolkit library for asynchronous apps
  libbitcoin is a Bitcoin library targeted high end use.  The library
  places a heavy focus around asynchronous operation.
@@ -45,12 +48,14 @@
  libbitcoin is designed as a toolkit - an independent set of mutual
  components with no dependencies between them.
 
-Package: libbitcoin0-dbg
+Package: libbitcoin0v5-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends},
- libbitcoin0 (= ${binary:Version})
+ libbitcoin0v5 (= ${binary:Version})
+Conflicts: libbitcoin0-dbg
+Replaces: libbitcoin0-dbg
 Description: Bitcoin toolkit library for asynchronous apps - debugging symbols
  libbitcoin is a Bitcoin library targeted high end use.  The library
  places a heavy focus around asynchronous operation.
@@ -64,7 +69,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libbitcoin0 (= ${binary:Version}),
+Depends: libbitcoin0v5 (= ${binary:Version}),
  ${devlibs:Depends},
  ${misc:Depends}
 Suggests: libbitcoin-doc
diff -Nru libbitcoin-2.0/debian/control.in libbitcoin-2.0/debian/control.in
--- libbitcoin-2.0/debian/control.in	2014-11-21 22:46:04.000000000 +0100
+++ libbitcoin-2.0/debian/control.in	2015-08-05 12:15:33.000000000 +0200
@@ -9,7 +9,7 @@
 Vcs-Git: git://git.debian.org/pkg-bitcoin/libbitcoin.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-bitcoin/libbitcoin.git
 
-Package: libbitcoin0
+Package: libbitcoin0v5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -24,12 +24,12 @@
  libbitcoin is designed as a toolkit - an independent set of mutual
  components with no dependencies between them.
 
-Package: libbitcoin0-dbg
+Package: libbitcoin0v5-dbg
 Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends},
- libbitcoin0 (= ${binary:Version})
+ libbitcoin0v5 (= ${binary:Version})
 Description: Bitcoin toolkit library for asynchronous apps - debugging symbols
  libbitcoin is a Bitcoin library targeted high end use.  The library
  places a heavy focus around asynchronous operation.
@@ -43,7 +43,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libbitcoin0 (= ${binary:Version}),
+Depends: libbitcoin0v5 (= ${binary:Version}),
  ${devlibs:Depends},
  ${misc:Depends}
 Suggests: libbitcoin-doc
diff -Nru libbitcoin-2.0/debian/libbitcoin0v5-dbg.lintian-overrides libbitcoin-2.0/debian/libbitcoin0v5-dbg.lintian-overrides
--- libbitcoin-2.0/debian/libbitcoin0v5-dbg.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ libbitcoin-2.0/debian/libbitcoin0v5-dbg.lintian-overrides	2015-08-05 12:15:33.000000000 +0200
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libbitcoin0v5-dbg: package-name-doesnt-match-sonames libbitcoin0-dbg
diff -Nru libbitcoin-2.0/debian/libbitcoin0v5.lintian-overrides libbitcoin-2.0/debian/libbitcoin0v5.lintian-overrides
--- libbitcoin-2.0/debian/libbitcoin0v5.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ libbitcoin-2.0/debian/libbitcoin0v5.lintian-overrides	2015-08-05 12:15:33.000000000 +0200
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libbitcoin0v5: package-name-doesnt-match-sonames libbitcoin0
diff -Nru libbitcoin-2.0/debian/patches/missing-include.patch libbitcoin-2.0/debian/patches/missing-include.patch
--- libbitcoin-2.0/debian/patches/missing-include.patch	1970-01-01 01:00:00.000000000 +0100
+++ libbitcoin-2.0/debian/patches/missing-include.patch	2015-08-05 12:15:33.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Fix FTBFS due to unknown std::cout
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Forwarded: No, file is gone in latest upstream
+
+Index: libbitcoin-2.0/src/utility/mnemonic.cpp
+===================================================================
+--- libbitcoin-2.0.orig/src/utility/mnemonic.cpp
++++ libbitcoin-2.0/src/utility/mnemonic.cpp
+@@ -21,6 +21,7 @@
+ 
+ #include <algorithm>
+ #include <sstream>
++#include <iostream>
+ #include <bitcoin/utility/assert.hpp>
+ 
+ namespace libbitcoin {
diff -Nru libbitcoin-2.0/debian/patches/series libbitcoin-2.0/debian/patches/series
--- libbitcoin-2.0/debian/patches/series	2014-11-21 21:53:54.000000000 +0100
+++ libbitcoin-2.0/debian/patches/series	2015-08-05 12:15:33.000000000 +0200
@@ -1,3 +1,4 @@
 1001_fix_include_Boost_endian.patch
 big-endian.patch
 2001-fix-for-768726.patch
+missing-include.patch
diff -Nru libbitcoin-2.0/debian/rules libbitcoin-2.0/debian/rules
--- libbitcoin-2.0/debian/rules	2014-06-26 14:03:22.000000000 +0200
+++ libbitcoin-2.0/debian/rules	2015-08-05 12:15:33.000000000 +0200
@@ -33,7 +33,7 @@
 
 pkg = $(DEB_SOURCE_PACKAGE)
 stem = $(patsubst lib%,%,$(pkg))
-abi = 0
+abi = 0v5
 lib = lib$(stem)
 libpkg = lib$(stem)$(abi)
 devpkg = lib$(stem)-dev
-------------- 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/pkg-bitcoin-devel/attachments/20150805/57c0e9ad/attachment-0001.sig>


More information about the Pkg-bitcoin-devel mailing list