[Pkg-bitcoin-commits] [libbitcoin] 01/02: Merge NMUs.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libbitcoin.

commit 07a49c3c38d39488130ffb7cc78b2dbbc4c7c7ac
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 30 14:41:42 2016 +0200

    Merge NMUs.
---
 debian/changelog                           | 34 ++++++++++++++++++++++++++++++
 debian/control.in.in                       |  4 ++++
 debian/libbitcoin0v5-dbg.lintian-overrides |  2 ++
 debian/libbitcoin0v5.lintian-overrides     |  2 ++
 debian/rules                               |  2 +-
 5 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0461fc6..d683231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,40 @@ libbitcoin (2.11.0-1) unstable; urgency=medium
 
  -- Jonas Smedegaard <dr at jones.dk>  Mon, 25 Apr 2016 13:27:23 +0200
 
+libbitcoin (2.0-2.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: Revert unintended Maintainer: change from previous NMU.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 31 Aug 2015 10:21:04 +0200
+
+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.
+  * Apply patch from BTS to fix FTBFS in jessie: configure: error: cannot find
+    install-sh, install.sh, or shtool in "." "./.." "./../.."" (Closes: #768726)
+
+ -- Tobias Frost <tobi at debian.org>  Fri, 21 Nov 2014 22:44:56 +0100
+
+libbitcoin (2.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS on big endian architectures.
+    Add big-endian.patch.
+    Patch by Jurica Stanojkovic <Jurica.Stanojkovic at imgtec.com>.
+    Closes: #765355.
+
+ -- Anibal Monsalve Salazar <anibal at debian.org>  Wed, 15 Oct 2014 08:48:57 +0100
+
 libbitcoin (2.0-2) unstable; urgency=medium
 
   * Add patch 1001 to fix include Boost endian include.
diff --git a/debian/control.in.in b/debian/control.in.in
index 5f99d52..1d18f4b 100644
--- a/debian/control.in.in
+++ b/debian/control.in.in
@@ -17,6 +17,8 @@ Depends: ${shlibs:Depends},
 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.
@@ -30,6 +32,8 @@ Priority: extra
 Architecture: any
 Depends: ${misc:Depends},
  __LIBPKG__ (= ${binary:Version})
+Conflicts: libbitcoin0
+Replaces: libbitcoin0
 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.
diff --git a/debian/libbitcoin0v5-dbg.lintian-overrides b/debian/libbitcoin0v5-dbg.lintian-overrides
new file mode 100644
index 0000000..f2b5bb8
--- /dev/null
+++ b/debian/libbitcoin0v5-dbg.lintian-overrides
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libbitcoin0v5-dbg: package-name-doesnt-match-sonames libbitcoin0-dbg
diff --git a/debian/libbitcoin0v5.lintian-overrides b/debian/libbitcoin0v5.lintian-overrides
new file mode 100644
index 0000000..8efd8a9
--- /dev/null
+++ b/debian/libbitcoin0v5.lintian-overrides
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libbitcoin0v5: package-name-doesnt-match-sonames libbitcoin0
diff --git a/debian/rules b/debian/rules
index ba3fcfc..981d94f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 pkg = $(DEB_SOURCE_PACKAGE)
 stem = $(patsubst lib%,%,$(pkg))
-abi = 0
+abi = 0v5
 lib = lib$(stem)
 libpkg = lib$(stem)$(abi)
 devpkg = lib$(stem)-dev

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libbitcoin.git