Bug#791168: libsidplay: diff for NMU version 1.36.59-7.1

2015-08-09 Thread GCS
Hi Jonathan,

On Sat, Aug 8, 2015 at 4:54 PM, Jonathan Wiltshire j...@debian.org wrote:
 I've prepared an NMU for libsidplay (versioned as 1.36.59-7.1) and
 uploaded it to DELAYED/2. Please feel free to tell me if I
 should delay it longer.
 Thanks! But I had other things to apply and -8 is uploaded and just accepted.

Cheers,
Laszlo/GCS


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#791168: libsidplay: diff for NMU version 1.36.59-7.1

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

Dear maintainer,

I've prepared an NMU for libsidplay (versioned as 1.36.59-7.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 libsidplay-1.36.59/debian/changelog libsidplay-1.36.59/debian/changelog
--- libsidplay-1.36.59/debian/changelog	2015-02-07 14:10:27.0 +
+++ libsidplay-1.36.59/debian/changelog	2015-08-08 15:49:46.0 +0100
@@ -1,3 +1,11 @@
+libsidplay (1.36.59-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++5 ABI transition, patch
+from Ubuntu (see #791168)
+
+ -- Jonathan Wiltshire j...@debian.org  Sat, 08 Aug 2015 15:49:45 +0100
+
 libsidplay (1.36.59-7) unstable; urgency=low
 
   * Do not suggest already removed xsidplay package (closes: #777077).
diff -Nru libsidplay-1.36.59/debian/control libsidplay-1.36.59/debian/control
--- libsidplay-1.36.59/debian/control	2015-02-07 14:08:22.0 +
+++ libsidplay-1.36.59/debian/control	2015-08-08 15:51:08.0 +0100
@@ -5,12 +5,12 @@
 Standards-Version: 3.9.5
 Build-Depends: debhelper (= 9), patch, dh-autoreconf
 
-Package: libsidplay1
+Package: libsidplay1v5
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libsidplay1.36, sidplay (= 1.36.36), libsidplay1-c102 (= 1.36.59-2)
-Replaces: libsidplay1.36, libsidplay1-c102 (= 1.36.59-2)
+Conflicts: libsidplay1, libsidplay1.36, sidplay (= 1.36.36), libsidplay1-c102 (= 1.36.59-2)
+Replaces: libsidplay1, libsidplay1.36, libsidplay1-c102 (= 1.36.59-2)
 Suggests: sidplay-base
 Description: SID (MOS 6581) emulation library
  This is a (shared) library that implements the emulation of the C64's
@@ -26,7 +26,7 @@
 Package: libsidplay1-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libsidplay1 (= ${binary:Version})
+Depends: ${misc:Depends}, libsidplay1v5 (= ${binary:Version})
 Conflicts: libsidplay1.36-dev
 Replaces: libsidplay1.36-dev
 Description: SID (MOS 6581) emulation library (development files)
diff -Nru libsidplay-1.36.59/debian/libsidplay1.dirs libsidplay-1.36.59/debian/libsidplay1.dirs
--- libsidplay-1.36.59/debian/libsidplay1.dirs	2014-06-25 19:03:50.0 +0100
+++ libsidplay-1.36.59/debian/libsidplay1.dirs	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-usr/lib
diff -Nru libsidplay-1.36.59/debian/libsidplay1.files libsidplay-1.36.59/debian/libsidplay1.files
--- libsidplay-1.36.59/debian/libsidplay1.files	2014-06-25 19:03:50.0 +0100
+++ libsidplay-1.36.59/debian/libsidplay1.files	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-usr/lib/*.so.*
diff -Nru libsidplay-1.36.59/debian/libsidplay1.shlibs libsidplay-1.36.59/debian/libsidplay1.shlibs
--- libsidplay-1.36.59/debian/libsidplay1.shlibs	2014-06-25 19:03:50.0 +0100
+++ libsidplay-1.36.59/debian/libsidplay1.shlibs	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-libsidplay 1 libsidplay1
diff -Nru libsidplay-1.36.59/debian/libsidplay1v5.dirs libsidplay-1.36.59/debian/libsidplay1v5.dirs
--- libsidplay-1.36.59/debian/libsidplay1v5.dirs	1970-01-01 01:00:00.0 +0100
+++ libsidplay-1.36.59/debian/libsidplay1v5.dirs	2015-08-08 15:50:05.0 +0100
@@ -0,0 +1 @@
+usr/lib
diff -Nru libsidplay-1.36.59/debian/libsidplay1v5.files libsidplay-1.36.59/debian/libsidplay1v5.files
--- libsidplay-1.36.59/debian/libsidplay1v5.files	1970-01-01 01:00:00.0 +0100
+++ libsidplay-1.36.59/debian/libsidplay1v5.files	2015-08-08 15:50:05.0 +0100
@@ -0,0 +1 @@
+usr/lib/*.so.*
diff -Nru libsidplay-1.36.59/debian/libsidplay1v5.lintian-overrides libsidplay-1.36.59/debian/libsidplay1v5.lintian-overrides
--- libsidplay-1.36.59/debian/libsidplay1v5.lintian-overrides	1970-01-01 01:00:00.0 +0100
+++ libsidplay-1.36.59/debian/libsidplay1v5.lintian-overrides	2015-08-08 15:50:05.0 +0100
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libsidplay1v5: package-name-doesnt-match-sonames libsidplay1
diff -Nru libsidplay-1.36.59/debian/libsidplay1v5.shlibs libsidplay-1.36.59/debian/libsidplay1v5.shlibs
--- libsidplay-1.36.59/debian/libsidplay1v5.shlibs	1970-01-01 01:00:00.0 +0100
+++ libsidplay-1.36.59/debian/libsidplay1v5.shlibs	2015-08-08 15:50:05.0 +0100
@@ -0,0 +1 @@
+libsidplay 1 libsidplay1v5


signature.asc
Description: Digital signature