diff -Nru sidplay-libs-2.1.1/debian/changelog sidplay-libs-2.1.1/debian/changelog --- sidplay-libs-2.1.1/debian/changelog 2015-08-05 11:42:44.000000000 +0000 +++ sidplay-libs-2.1.1/debian/changelog 2017-08-03 08:50:17.000000000 +0000 @@ -1,3 +1,21 @@ +sidplay-libs (2.1.1-15ubuntu1) artful; urgency=medium + + * Merge from Debian Sid (LP: #1708392). Remaining changes: + - Revert package rename for g++5 ABI transition, since the affected + symbols were not part of the ABI; and Provide: the renamed package for + compatibility. These changes can be dropped after the 18.04 release. + + -- Simon Quigley Thu, 03 Aug 2017 03:50:17 -0500 + +sidplay-libs (2.1.1-15) unstable; urgency=low + + * Fix FTBFS due to GCC 6 narrowing conversions (closes: #837378). + * Update my email address. + * Update debhelper level to 9 . + * Update Standards-Version to 3.9.8 . + + -- Laszlo Boszormenyi (GCS) Mon, 19 Sep 2016 17:29:28 +0000 + sidplay-libs (2.1.1-14ubuntu2) wily; urgency=medium * Fix manual calls to install to use new package name. diff -Nru sidplay-libs-2.1.1/debian/compat sidplay-libs-2.1.1/debian/compat --- sidplay-libs-2.1.1/debian/compat 2012-02-06 22:37:26.000000000 +0000 +++ sidplay-libs-2.1.1/debian/compat 2016-09-19 17:29:28.000000000 +0000 @@ -1 +1 @@ -6 +9 diff -Nru sidplay-libs-2.1.1/debian/control sidplay-libs-2.1.1/debian/control --- sidplay-libs-2.1.1/debian/control 2015-08-04 10:40:08.000000000 +0000 +++ sidplay-libs-2.1.1/debian/control 2017-08-03 08:50:17.000000000 +0000 @@ -2,14 +2,14 @@ Section: sound Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) -Build-Depends: debhelper (>= 6), autoconf, automake, libtool -Standards-Version: 3.9.2 +XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) +Build-Depends: debhelper (>= 9), autoconf, automake, libtool +Standards-Version: 3.9.8 Package: libsidplay2-dev Section: libdevel Architecture: any -Depends: libsidplay2v5 (= ${binary:Version}), ${misc:Depends} +Depends: libsidplay2 (= ${binary:Version}), ${misc:Depends} Description: SID (MOS 6581) emulation library This is a (shared) library that implements the emulation of the C64's SID chip (MOS 6581) and CPU (6510). It is used by several "player" @@ -22,12 +22,13 @@ information about the volunteers, who maintain the collection, look at the HVSC homepage http://www.hvsc.c64.org. -Package: libsidplay2v5 +Package: libsidplay2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libsidplay2, libsidplay2-1, libsidplay2-1c102 (<= 2.1.1-2) -Conflicts: libsidplay2, libsidplay2-1, libsidplay2-1c102 (<= 2.1.1-2) +Replaces: libsidplay2v5, libsidplay2-1, libsidplay2-1c102 (<= 2.1.1-2) +Conflicts: libsidplay2v5, libsidplay2-1, libsidplay2-1c102 (<= 2.1.1-2) +Provides: libsidplay2v5 Description: SID (MOS 6581) emulation library This is a (shared) library that implements the emulation of the C64's SID chip (MOS 6581) and CPU (6510). It is used by several "player" diff -Nru sidplay-libs-2.1.1/debian/copyright sidplay-libs-2.1.1/debian/copyright --- sidplay-libs-2.1.1/debian/copyright 2012-02-06 22:42:41.000000000 +0000 +++ sidplay-libs-2.1.1/debian/copyright 2016-09-19 17:29:28.000000000 +0000 @@ -1,6 +1,6 @@ This package was debianized by Ivo Timmermans on Mon, 12 Aug 2002 21:35:44 +0200. -Packaging taken over by Laszlo Boszormenyi on Sun, 15 Aug +Packaging taken over by Laszlo Boszormenyi on Sun, 15 Aug 2004 12:48:16 +0000. It was downloaded from http://sourceforge.net/projects/sidplay2/ diff -Nru sidplay-libs-2.1.1/debian/libsidplay2.dirs sidplay-libs-2.1.1/debian/libsidplay2.dirs --- sidplay-libs-2.1.1/debian/libsidplay2.dirs 1970-01-01 00:00:00.000000000 +0000 +++ sidplay-libs-2.1.1/debian/libsidplay2.dirs 2012-02-06 22:37:26.000000000 +0000 @@ -0,0 +1 @@ +usr/lib diff -Nru sidplay-libs-2.1.1/debian/libsidplay2.files sidplay-libs-2.1.1/debian/libsidplay2.files --- sidplay-libs-2.1.1/debian/libsidplay2.files 1970-01-01 00:00:00.000000000 +0000 +++ sidplay-libs-2.1.1/debian/libsidplay2.files 2012-02-06 22:37:26.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libsidplay*.so.* diff -Nru sidplay-libs-2.1.1/debian/libsidplay2.lintian sidplay-libs-2.1.1/debian/libsidplay2.lintian --- sidplay-libs-2.1.1/debian/libsidplay2.lintian 1970-01-01 00:00:00.000000000 +0000 +++ sidplay-libs-2.1.1/debian/libsidplay2.lintian 2012-02-06 22:37:26.000000000 +0000 @@ -0,0 +1 @@ +libsidplay2: package-name-doesnt-match-sonames libsidplay2-1 diff -Nru sidplay-libs-2.1.1/debian/libsidplay2v5.dirs sidplay-libs-2.1.1/debian/libsidplay2v5.dirs --- sidplay-libs-2.1.1/debian/libsidplay2v5.dirs 2015-08-04 10:40:08.000000000 +0000 +++ sidplay-libs-2.1.1/debian/libsidplay2v5.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib diff -Nru sidplay-libs-2.1.1/debian/libsidplay2v5.files sidplay-libs-2.1.1/debian/libsidplay2v5.files --- sidplay-libs-2.1.1/debian/libsidplay2v5.files 2015-08-04 10:40:08.000000000 +0000 +++ sidplay-libs-2.1.1/debian/libsidplay2v5.files 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libsidplay*.so.* diff -Nru sidplay-libs-2.1.1/debian/libsidplay2v5.lintian sidplay-libs-2.1.1/debian/libsidplay2v5.lintian --- sidplay-libs-2.1.1/debian/libsidplay2v5.lintian 2015-08-04 10:40:08.000000000 +0000 +++ sidplay-libs-2.1.1/debian/libsidplay2v5.lintian 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libsidplay2v5: package-name-doesnt-match-sonames libsidplay2-1 diff -Nru sidplay-libs-2.1.1/debian/patches/gcc6-fixes.patch sidplay-libs-2.1.1/debian/patches/gcc6-fixes.patch --- sidplay-libs-2.1.1/debian/patches/gcc6-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ sidplay-libs-2.1.1/debian/patches/gcc6-fixes.patch 2016-09-19 17:29:28.000000000 +0000 @@ -0,0 +1,22 @@ +Description: explicit cast to int8_t + Fix FTBFS with GCC 6 due to narrowing conversions from 'char' to 'int8_t'. +Author: Laszlo Boszormenyi (GCS) +Forwarded: no +Bug-Debian: https://bugs.debian.org/837378 +Last-Update: 2016-09-19 + +--- + +--- sidplay-libs-2.1.1.orig/libsidplay/src/xsid/xsid.cpp ++++ sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.cpp +@@ -96,8 +96,8 @@ const int8_t XSID::sampleConvertTable[16 + */ + const int8_t XSID::sampleConvertTable[16] = + { +- '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03', +- '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f' ++ (int8_t)'\x80', (int8_t)'\x94', (int8_t)'\xa9', (int8_t)'\xbc', (int8_t)'\xce', (int8_t)'\xe1', (int8_t)'\xf2', (int8_t)'\x03', ++ (int8_t)'\x1b', (int8_t)'\x2a', (int8_t)'\x3b', (int8_t)'\x49', (int8_t)'\x58', (int8_t)'\x66', (int8_t)'\x73', (int8_t)'\x7f' + }; + + const char *XSID::credit = diff -Nru sidplay-libs-2.1.1/debian/patches/series sidplay-libs-2.1.1/debian/patches/series --- sidplay-libs-2.1.1/debian/patches/series 2012-02-17 13:04:09.000000000 +0000 +++ sidplay-libs-2.1.1/debian/patches/series 2016-09-19 17:29:28.000000000 +0000 @@ -2,3 +2,4 @@ configure-fixes.patch pkg-config.patch hardsid_4_bsd.patch +gcc6-fixes.patch diff -Nru sidplay-libs-2.1.1/debian/rules sidplay-libs-2.1.1/debian/rules --- sidplay-libs-2.1.1/debian/rules 2015-08-05 11:51:36.000000000 +0000 +++ sidplay-libs-2.1.1/debian/rules 2016-09-19 17:29:28.000000000 +0000 @@ -1,6 +1,5 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -56,6 +55,11 @@ -name mkinstalldirs -o -name stamp-h1 -o -name INSTALL -o \ -name Makefile -o -name Makefile.in | xargs rm -f rm -f libsidplay/unix/sidint.h + rm -f builders/hardsid-builder/unix/compile \ + builders/resid-builder/unix/compile \ + libsidplay/unix/compile \ + libsidutils/unix/compile \ + resid/compile rm -f configure-stamp build-stamp dh_clean @@ -86,27 +90,22 @@ # Remove *.la files per policy 3.9.1.0 find $(CURDIR)/debian/tmp/usr -name '*.la' -delete -# Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. -# Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_movefiles - install -d -o root -g root -m 755 debian/libsidplay2v5/usr/share/doc/libsidplay2v5 - install -d -o root -g root -m 755 debian/libsidplay2v5/usr/share/lintian/overrides - cp $(CURDIR)/debian/libsidplay2v5.lintian $(CURDIR)/debian/libsidplay2v5/usr/share/lintian/overrides/libsidplay2v5 + install -d -o root -g root -m 755 debian/libsidplay2/usr/share/doc/libsidplay2 + install -d -o root -g root -m 755 debian/libsidplay2/usr/share/lintian/overrides + cp $(CURDIR)/debian/libsidplay2.lintian $(CURDIR)/debian/libsidplay2/usr/share/lintian/overrides/libsidplay2 install -d -o root -g root -m 755 debian/libsidplay-dev/usr/share/doc install -d -o root -g root -m 755 debian/libsidutils0/usr/share/doc/libsidutils0 install -d -o root -g root -m 755 debian/libsidutils-dev/usr/share/doc install -d -o root -g root -m 755 debian/libresid-builder0c2a/usr/share/doc/libresid-builder0c2a install -d -o root -g root -m 755 debian/libresid-builder-dev/usr/share/doc -# ln -s libsidplay2v5 debian/libsidplay-dev/usr/share/doc/libsidplay-dev -# ln -s libsidutils0 debian/libsidutils-dev/usr/share/doc/libsidutils-dev -# ln -s libresid-builder0c2a debian/libresid-builder-dev/usr/share/doc/libresid-builder-dev dh_installdocs dh_installexamples @@ -115,7 +114,7 @@ dh_installman dh_installinfo - install -o root -g root -m 644 libsidplay/ChangeLog debian/libsidplay2v5/usr/share/doc/libsidplay2v5/changelog + install -o root -g root -m 644 libsidplay/ChangeLog debian/libsidplay2/usr/share/doc/libsidplay2/changelog install -o root -g root -m 644 libsidutils/ChangeLog debian/libsidutils0/usr/share/doc/libsidutils0/changelog dh_installchangelogs dh_link