[Debian-med-packaging] Bug#791187: nmu diff for libzeep 3.0.2-3.1

[Julien Cristau]

Dear maintainer,

I've prepared a NMU for libzeep, 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 e8d683cbe28c35d2bbbd808c069c33a626270c4d Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau at debian.org>
Date: Sun, 16 Aug 2015 17:45:25 +0200
Subject: [PATCH] Rename library packages for g++5 ABI transition (closes:
 791187).

---
 debian/changelog                        | 7 +++++++
 debian/control                          | 8 ++++----
 debian/libzeep3.0v5.lintian-overrides   | 2 --
 debian/libzeep3.0v5v5.lintian-overrides | 2 ++
 debian/rules                            | 2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)
 delete mode 100644 debian/libzeep3.0v5.lintian-overrides
 create mode 100644 debian/libzeep3.0v5v5.lintian-overrides

diff --git a/debian/changelog b/debian/changelog
index b35b5b8..990511d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libzeep (3.0.2-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++5 ABI transition (closes: 791187).
+
+ -- Julien Cristau <jcristau at debian.org>  Sun, 16 Aug 2015 17:45:25 +0200
+
 libzeep (3.0.2-3) unstable; urgency=medium
 
   * Rename library packages for g++5 ABI transition.
diff --git a/debian/control b/debian/control
index fe5db44..b065edf 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Package: libzeep-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libzeep3.0v5 (= ${binary:Version}),
+         libzeep3.0v5v5 (= ${binary:Version}),
          libboost-dev (>= 1.49.0),
          libboost-filesystem-dev (>= 1.49.0),
          libboost-system-dev (>= 1.49.0),
@@ -43,12 +43,12 @@ Description: Development files for libzeep
  This specific package contains all files needed to develop new
  software using libzeep.
 
-Package: libzeep3.0v5
+Package: libzeep3.0v5v5
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libzeep3.0
-Replaces: libzeep3.0
+Conflicts: libzeep3.0v5, libzeep3.0
+Replaces: libzeep3.0v5, libzeep3.0
 Description: Library files for libzeep
  Libzeep is a C++ library providing a validating XML parser, XML DOM tree
  implementation, XPath 1.0 support and code to create SOAP/REST servers as
diff --git a/debian/libzeep3.0v5.lintian-overrides b/debian/libzeep3.0v5.lintian-overrides
deleted file mode 100644
index cf6a284..0000000
--- a/debian/libzeep3.0v5.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# G++5 ABI transition
-libzeep3.0v5: package-name-doesnt-match-sonames libzeep3.0
diff --git a/debian/libzeep3.0v5v5.lintian-overrides b/debian/libzeep3.0v5v5.lintian-overrides
new file mode 100644
index 0000000..c1dfa26
--- /dev/null
+++ b/debian/libzeep3.0v5v5.lintian-overrides
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libzeep3.0v5v5: package-name-doesnt-match-sonames libzeep3.0
diff --git a/debian/rules b/debian/rules
index f6f0b5a..8dab124 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_auto_build:
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-	$(MAKE) DESTDIR=$(CURDIR)/debian/libzeep3.0v5 install-libs
+	$(MAKE) DESTDIR=$(CURDIR)/debian/libzeep3.0v5v5 install-libs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-dev install-dev
 
 .PHONY: get-orig-source
-- 
2.5.0