Bug#791134: libktoblzcheck: diff for NMU version 1.48-2.1

2015-08-10 Thread Jonathan Wiltshire
Slightly updated patch attached, because the overridden call to
dh_makeshlibs needs to be dropped. This is uploaded directly to unstable
(well, NEW).


-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

diff -Nru libktoblzcheck-1.48/debian/changelog libktoblzcheck-1.48/debian/changelog
--- libktoblzcheck-1.48/debian/changelog	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/changelog	2015-08-10 23:10:13.0 +0100
@@ -1,3 +1,12 @@
+libktoblzcheck (1.48-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++ ABI transition,
+patch from Ubuntu (see #791134)
+  * Remove override of dh_makeshlibs, no longer required
+
+ -- Jonathan Wiltshire j...@debian.org  Sat, 08 Aug 2015 13:30:21 +0100
+
 libktoblzcheck (1.48-2) unstable; urgency=medium
 
   * Add a minimalistic autopkgtest.
diff -Nru libktoblzcheck-1.48/debian/control libktoblzcheck-1.48/debian/control
--- libktoblzcheck-1.48/debian/control	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/control	2015-08-08 13:29:50.0 +0100
@@ -11,10 +11,12 @@
 Vcs-Browser: http://source.lenk.info/git/libktoblzcheck.git
 Vcs-Git: git://source.lenk.info/git/libktoblzcheck.git
 
-Package: libktoblzcheck1c2a
+Package: libktoblzcheck1v5
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
 Suggests: ktoblzcheck
+Conflicts: libktoblzcheck1c2a
+Replaces: libktoblzcheck1c2a
 Description: library for verification of account numbers and bank codes
  libktoblzcheck is a library for verification of bank account numbers and bank
  codes (BLZ) of German Banks. It is based on the specifications of the
@@ -24,7 +26,7 @@
 Package: libktoblzcheck1-dev
 Section: libdevel
 Architecture: any
-Depends: libktoblzcheck1c2a (= ${binary:Version}), ${misc:Depends}
+Depends: libktoblzcheck1v5 (= ${binary:Version}), ${misc:Depends}
 Description: library for verification of account numbers and bank codes (development files)
  libktoblzcheck is a library for verification of bank account numbers and bank
  codes (BLZ) of German Banks. It is based on the specifications of the
@@ -47,7 +49,7 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libktoblzcheck1c2a (= ${binary:Version}),
+Depends: libktoblzcheck1v5 (= ${binary:Version}),
   ktoblzcheck (= ${binary:Version}), ${misc:Depends}
 Description: library for verification of account numbers and bank codes (debug symbols)
  libktoblzcheck is a library for verification of bank account numbers and bank
@@ -60,7 +62,7 @@
 Package: python-ktoblzcheck
 Section: python
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, libktoblzcheck1c2a
+Depends: ${python:Depends}, ${misc:Depends}, libktoblzcheck1v5
 Description: library for verification of account numbers and bank codes (Python bindings)
  libktoblzcheck is a library for verification of bank account numbers and bank
  codes (BLZ) of German Banks. It is based on the specifications of the
diff -Nru libktoblzcheck-1.48/debian/libktoblzcheck1c2a.docs libktoblzcheck-1.48/debian/libktoblzcheck1c2a.docs
--- libktoblzcheck-1.48/debian/libktoblzcheck1c2a.docs	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/libktoblzcheck1c2a.docs	1970-01-01 01:00:00.0 +0100
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
diff -Nru libktoblzcheck-1.48/debian/libktoblzcheck1c2a.install libktoblzcheck-1.48/debian/libktoblzcheck1c2a.install
--- libktoblzcheck-1.48/debian/libktoblzcheck1c2a.install	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/libktoblzcheck1c2a.install	1970-01-01 01:00:00.0 +0100
@@ -1,2 +0,0 @@
-usr/lib/lib*.so.*
-var/lib/ktoblzcheck1/*
diff -Nru libktoblzcheck-1.48/debian/libktoblzcheck1c2a.postrm libktoblzcheck-1.48/debian/libktoblzcheck1c2a.postrm
--- libktoblzcheck-1.48/debian/libktoblzcheck1c2a.postrm	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/libktoblzcheck1c2a.postrm	1970-01-01 01:00:00.0 +0100
@@ -1,32 +0,0 @@
-#!/bin/sh
-# postrm script for libktoblzcheck
-
-set -e
-
-bankdatadir=/var/lib/ktoblzcheck1
-
-case $1 in
-purge)
-	# remove out-of-package bankdata files possibly generated by
-	# online_update.pl script:
-	if [ -d $bankdatadir ]; then
-	rm $bankdatadir/bankdata_[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].txt 2 /dev/null || true
-	rmdir $bankdatadir 2 /dev/null || true
-	fi
-;;
-
-remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-;;
-
-*)
-echo postrm called with unknown argument \`$1' 2
-exit 1
-;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -Nru libktoblzcheck-1.48/debian/libktoblzcheck1v5.docs libktoblzcheck-1.48/debian/libktoblzcheck1v5.docs
--- 

Bug#791134: libktoblzcheck: diff for NMU version 1.48-2.1

2015-08-08 Thread Jonathan Wiltshire
Control: tag -1 patch pending

Dear maintainer,

I've prepared an NMU for libktoblzcheck (versioned as 1.48-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

diff -Nru libktoblzcheck-1.48/debian/changelog libktoblzcheck-1.48/debian/changelog
--- libktoblzcheck-1.48/debian/changelog	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/changelog	2015-08-08 13:30:22.0 +0100
@@ -1,3 +1,11 @@
+libktoblzcheck (1.48-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++ ABI transition,
+patch from Ubuntu (see #791134)
+
+ -- Jonathan Wiltshire j...@debian.org  Sat, 08 Aug 2015 13:30:21 +0100
+
 libktoblzcheck (1.48-2) unstable; urgency=medium
 
   * Add a minimalistic autopkgtest.
diff -Nru libktoblzcheck-1.48/debian/control libktoblzcheck-1.48/debian/control
--- libktoblzcheck-1.48/debian/control	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/control	2015-08-08 13:29:50.0 +0100
@@ -11,10 +11,12 @@
 Vcs-Browser: http://source.lenk.info/git/libktoblzcheck.git
 Vcs-Git: git://source.lenk.info/git/libktoblzcheck.git
 
-Package: libktoblzcheck1c2a
+Package: libktoblzcheck1v5
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
 Suggests: ktoblzcheck
+Conflicts: libktoblzcheck1c2a
+Replaces: libktoblzcheck1c2a
 Description: library for verification of account numbers and bank codes
  libktoblzcheck is a library for verification of bank account numbers and bank
  codes (BLZ) of German Banks. It is based on the specifications of the
@@ -24,7 +26,7 @@
 Package: libktoblzcheck1-dev
 Section: libdevel
 Architecture: any
-Depends: libktoblzcheck1c2a (= ${binary:Version}), ${misc:Depends}
+Depends: libktoblzcheck1v5 (= ${binary:Version}), ${misc:Depends}
 Description: library for verification of account numbers and bank codes (development files)
  libktoblzcheck is a library for verification of bank account numbers and bank
  codes (BLZ) of German Banks. It is based on the specifications of the
@@ -47,7 +49,7 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libktoblzcheck1c2a (= ${binary:Version}),
+Depends: libktoblzcheck1v5 (= ${binary:Version}),
   ktoblzcheck (= ${binary:Version}), ${misc:Depends}
 Description: library for verification of account numbers and bank codes (debug symbols)
  libktoblzcheck is a library for verification of bank account numbers and bank
@@ -60,7 +62,7 @@
 Package: python-ktoblzcheck
 Section: python
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, libktoblzcheck1c2a
+Depends: ${python:Depends}, ${misc:Depends}, libktoblzcheck1v5
 Description: library for verification of account numbers and bank codes (Python bindings)
  libktoblzcheck is a library for verification of bank account numbers and bank
  codes (BLZ) of German Banks. It is based on the specifications of the
diff -Nru libktoblzcheck-1.48/debian/libktoblzcheck1c2a.docs libktoblzcheck-1.48/debian/libktoblzcheck1c2a.docs
--- libktoblzcheck-1.48/debian/libktoblzcheck1c2a.docs	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/libktoblzcheck1c2a.docs	1970-01-01 01:00:00.0 +0100
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
diff -Nru libktoblzcheck-1.48/debian/libktoblzcheck1c2a.install libktoblzcheck-1.48/debian/libktoblzcheck1c2a.install
--- libktoblzcheck-1.48/debian/libktoblzcheck1c2a.install	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/libktoblzcheck1c2a.install	1970-01-01 01:00:00.0 +0100
@@ -1,2 +0,0 @@
-usr/lib/lib*.so.*
-var/lib/ktoblzcheck1/*
diff -Nru libktoblzcheck-1.48/debian/libktoblzcheck1c2a.postrm libktoblzcheck-1.48/debian/libktoblzcheck1c2a.postrm
--- libktoblzcheck-1.48/debian/libktoblzcheck1c2a.postrm	2015-05-03 20:52:07.0 +0100
+++ libktoblzcheck-1.48/debian/libktoblzcheck1c2a.postrm	1970-01-01 01:00:00.0 +0100
@@ -1,32 +0,0 @@
-#!/bin/sh
-# postrm script for libktoblzcheck
-
-set -e
-
-bankdatadir=/var/lib/ktoblzcheck1
-
-case $1 in
-purge)
-	# remove out-of-package bankdata files possibly generated by
-	# online_update.pl script:
-	if [ -d $bankdatadir ]; then
-	rm $bankdatadir/bankdata_[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9].txt 2 /dev/null || true
-	rmdir $bankdatadir 2 /dev/null || true
-	fi
-;;
-
-remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-;;
-
-*)
-echo postrm called with unknown argument \`$1' 2
-exit 1
-;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -Nru libktoblzcheck-1.48/debian/libktoblzcheck1v5.docs libktoblzcheck-1.48/debian/libktoblzcheck1v5.docs