Package: libsidplay2
Version: 2.1.1-14
Severity: wishlist
Tags: patch
Dear Maintainer,
It would be nice if sidplay-libs was converted to multiarch.
Attached debdiff upgrade debhelper to 9 and adds multi-arch support;
Out of BD, I've successfully rebuilt mpd against patched package (but
have not checked other packages);
Known limitation: /usr/include/sidplay/sidconfig.h is autoconf-generated
and not co-installable (rendering libsidplay2-dev non-multi-arch in
attached debdiff) [note that sidint.h is also autogenerated, but likely
same&co-installable on most/all platforms];
Disclaimer: I have very limited experience with debian packaging, please
review and test debdiff carefully.
-- System Information:
Debian Release: 8.1
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: i386 (x86_64)
Foreign Architectures: amd64
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=ru_RU.KOI8-R, LC_CTYPE=ru_RU.KOI8-R (charmap=KOI8-R)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages libsidplay2 depends on:
ii libc6 2.19-18
ii libgcc1 1:4.9.2-10
ii libstdc++6 4.9.2-10
libsidplay2 recommends no packages.
libsidplay2 suggests no packages.
-- no debconf information
diff -Nru sidplay-libs-2.1.1/debian/autoreconf sidplay-libs-2.1.1/debian/autoreconf
--- sidplay-libs-2.1.1/debian/autoreconf 1970-01-01 03:00:00.000000000 +0300
+++ sidplay-libs-2.1.1/debian/autoreconf 2015-07-24 17:05:33.000000000 +0300
@@ -0,0 +1,6 @@
+.
+libsidplay
+libsidutils
+resid
+builders/hardsid-builder
+builders/resid-builder
diff -Nru sidplay-libs-2.1.1/debian/changelog sidplay-libs-2.1.1/debian/changelog
--- sidplay-libs-2.1.1/debian/changelog 2013-02-25 21:53:56.000000000 +0400
+++ sidplay-libs-2.1.1/debian/changelog 2015-07-24 16:52:13.000000000 +0300
@@ -1,3 +1,11 @@
+sidplay-libs (2.1.1-14+1~local1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Updated to debhelper 9.
+ * Added Multi-Arch support.
+
+ -- Yuriy M. Kaminskiy <yumkam+deb...@gmail.com> Fri, 24 Jul 2015 16:51:42 +0300
+
sidplay-libs (2.1.1-14) unstable; urgency=low
[ Sebastian Ramacher <sramac...@debian.org> ]
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-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/compat 2015-07-24 16:55:43.000000000 +0300
@@ -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 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/control 2015-07-24 17:28:57.000000000 +0300
@@ -2,12 +2,13 @@
Section: sound
Priority: optional
Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.hu>
-Build-Depends: debhelper (>= 6), autoconf, automake, libtool
+Build-Depends: debhelper (>= 9), dh-autoreconf
Standards-Version: 3.9.2
Package: libsidplay2-dev
Section: libdevel
Architecture: any
+#Multi-Arch: same # XXX /usr/include/sidplay/sidconfig.h is not co-installable!
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
@@ -24,6 +25,8 @@
Package: libsidplay2
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libsidplay2-1, libsidplay2-1c102 (<= 2.1.1-2)
Conflicts: libsidplay2-1, libsidplay2-1c102 (<= 2.1.1-2)
@@ -42,6 +45,7 @@
Package: libsidutils-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libsidutils0 (= ${binary:Version}), ${misc:Depends}
Description: utility functions for SID players
This library contains various things deemed useful to all SID players
@@ -64,6 +68,8 @@
Package: libsidutils0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: utility functions for SID players
This library contains various things deemed useful to all SID players
@@ -86,6 +92,7 @@
Package: libresid-builder-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libresid-builder0c2a (= ${binary:Version}), ${misc:Depends}
Replaces: libresid-dev (<= 2.1.0)
Conflicts: libresid-dev (<= 2.1.0)
@@ -97,6 +104,8 @@
Package: libresid-builder0c2a
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: libresid2c102 (<= 2.1.1-2), libresid-builder0
Conflicts: libresid2c102 (<= 2.1.1-2), libresid-builder0
diff -Nru sidplay-libs-2.1.1/debian/libresid-builder0c2a.dirs sidplay-libs-2.1.1/debian/libresid-builder0c2a.dirs
--- sidplay-libs-2.1.1/debian/libresid-builder0c2a.dirs 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libresid-builder0c2a.dirs 1970-01-01 03:00:00.000000000 +0300
@@ -1 +0,0 @@
-usr/lib
diff -Nru sidplay-libs-2.1.1/debian/libresid-builder0c2a.files sidplay-libs-2.1.1/debian/libresid-builder0c2a.files
--- sidplay-libs-2.1.1/debian/libresid-builder0c2a.files 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libresid-builder0c2a.files 1970-01-01 03:00:00.000000000 +0300
@@ -1,2 +0,0 @@
-usr/lib/libresid-builder.so.*
-usr/lib/libhardsid-builder.so.*
diff -Nru sidplay-libs-2.1.1/debian/libresid-builder0c2a.install sidplay-libs-2.1.1/debian/libresid-builder0c2a.install
--- sidplay-libs-2.1.1/debian/libresid-builder0c2a.install 1970-01-01 03:00:00.000000000 +0300
+++ sidplay-libs-2.1.1/debian/libresid-builder0c2a.install 2015-07-24 16:48:32.000000000 +0300
@@ -0,0 +1,2 @@
+usr/lib/*/libresid-builder.so.*
+usr/lib/*/libhardsid-builder.so.*
diff -Nru sidplay-libs-2.1.1/debian/libresid-builder-dev.dirs sidplay-libs-2.1.1/debian/libresid-builder-dev.dirs
--- sidplay-libs-2.1.1/debian/libresid-builder-dev.dirs 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libresid-builder-dev.dirs 2015-07-24 16:49:46.000000000 +0300
@@ -1,2 +1 @@
-usr/lib
usr/include/sidplay/builders
diff -Nru sidplay-libs-2.1.1/debian/libresid-builder-dev.files sidplay-libs-2.1.1/debian/libresid-builder-dev.files
--- sidplay-libs-2.1.1/debian/libresid-builder-dev.files 2012-02-07 02:43:02.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libresid-builder-dev.files 1970-01-01 03:00:00.000000000 +0300
@@ -1,7 +0,0 @@
-usr/include/sidplay/builders/resid.h
-usr/include/sidplay/builders/hardsid.h
-usr/lib/libresid-builder.a
-usr/lib/libresid-builder.so
-usr/lib/libhardsid-builder.so
-usr/lib/libhardsid-builder.a
-
diff -Nru sidplay-libs-2.1.1/debian/libresid-builder-dev.install sidplay-libs-2.1.1/debian/libresid-builder-dev.install
--- sidplay-libs-2.1.1/debian/libresid-builder-dev.install 1970-01-01 03:00:00.000000000 +0300
+++ sidplay-libs-2.1.1/debian/libresid-builder-dev.install 2015-07-24 16:48:14.000000000 +0300
@@ -0,0 +1,7 @@
+usr/include/sidplay/builders/resid.h
+usr/include/sidplay/builders/hardsid.h
+usr/lib/*/libresid-builder.a
+usr/lib/*/libresid-builder.so
+usr/lib/*/libhardsid-builder.so
+usr/lib/*/libhardsid-builder.a
+
diff -Nru sidplay-libs-2.1.1/debian/libsidplay2-dev.dirs sidplay-libs-2.1.1/debian/libsidplay2-dev.dirs
--- sidplay-libs-2.1.1/debian/libsidplay2-dev.dirs 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidplay2-dev.dirs 1970-01-01 03:00:00.000000000 +0300
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/lib/pkgconfig
diff -Nru sidplay-libs-2.1.1/debian/libsidplay2-dev.files sidplay-libs-2.1.1/debian/libsidplay2-dev.files
--- sidplay-libs-2.1.1/debian/libsidplay2-dev.files 2012-02-07 02:43:19.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidplay2-dev.files 1970-01-01 03:00:00.000000000 +0300
@@ -1,4 +0,0 @@
-usr/include/sidplay/*.h
-usr/lib/libsidplay*.a
-usr/lib/libsidplay*.so
-usr/lib/pkgconfig/libsidplay2.pc
diff -Nru sidplay-libs-2.1.1/debian/libsidplay2-dev.install sidplay-libs-2.1.1/debian/libsidplay2-dev.install
--- sidplay-libs-2.1.1/debian/libsidplay2-dev.install 1970-01-01 03:00:00.000000000 +0300
+++ sidplay-libs-2.1.1/debian/libsidplay2-dev.install 2015-07-24 16:48:41.000000000 +0300
@@ -0,0 +1,4 @@
+usr/include/sidplay/*.h
+usr/lib/*/libsidplay*.a
+usr/lib/*/libsidplay*.so
+usr/lib/*/pkgconfig/libsidplay2.pc
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 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidplay2.dirs 1970-01-01 03:00:00.000000000 +0300
@@ -1 +0,0 @@
-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 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidplay2.files 1970-01-01 03:00:00.000000000 +0300
@@ -1 +0,0 @@
-usr/lib/libsidplay*.so.*
diff -Nru sidplay-libs-2.1.1/debian/libsidplay2.install sidplay-libs-2.1.1/debian/libsidplay2.install
--- sidplay-libs-2.1.1/debian/libsidplay2.install 1970-01-01 03:00:00.000000000 +0300
+++ sidplay-libs-2.1.1/debian/libsidplay2.install 2015-07-24 16:48:46.000000000 +0300
@@ -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 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidplay2.lintian 1970-01-01 03:00:00.000000000 +0300
@@ -1 +0,0 @@
-libsidplay2: package-name-doesnt-match-sonames libsidplay2-1
diff -Nru sidplay-libs-2.1.1/debian/libsidplay2.lintian-overrides sidplay-libs-2.1.1/debian/libsidplay2.lintian-overrides
--- sidplay-libs-2.1.1/debian/libsidplay2.lintian-overrides 1970-01-01 03:00:00.000000000 +0300
+++ sidplay-libs-2.1.1/debian/libsidplay2.lintian-overrides 2012-02-07 02:37:26.000000000 +0400
@@ -0,0 +1 @@
+libsidplay2: package-name-doesnt-match-sonames libsidplay2-1
diff -Nru sidplay-libs-2.1.1/debian/libsidutils0.dirs sidplay-libs-2.1.1/debian/libsidutils0.dirs
--- sidplay-libs-2.1.1/debian/libsidutils0.dirs 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidutils0.dirs 1970-01-01 03:00:00.000000000 +0300
@@ -1 +0,0 @@
-usr/lib
diff -Nru sidplay-libs-2.1.1/debian/libsidutils0.files sidplay-libs-2.1.1/debian/libsidutils0.files
--- sidplay-libs-2.1.1/debian/libsidutils0.files 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidutils0.files 1970-01-01 03:00:00.000000000 +0300
@@ -1 +0,0 @@
-usr/lib/libsidutils*.so.*
diff -Nru sidplay-libs-2.1.1/debian/libsidutils0.install sidplay-libs-2.1.1/debian/libsidutils0.install
--- sidplay-libs-2.1.1/debian/libsidutils0.install 1970-01-01 03:00:00.000000000 +0300
+++ sidplay-libs-2.1.1/debian/libsidutils0.install 2015-07-24 16:48:23.000000000 +0300
@@ -0,0 +1 @@
+usr/lib/*/libsidutils*.so.*
diff -Nru sidplay-libs-2.1.1/debian/libsidutils-dev.dirs sidplay-libs-2.1.1/debian/libsidutils-dev.dirs
--- sidplay-libs-2.1.1/debian/libsidutils-dev.dirs 2012-02-07 02:37:26.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidutils-dev.dirs 1970-01-01 03:00:00.000000000 +0300
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/lib/pkgconfig
diff -Nru sidplay-libs-2.1.1/debian/libsidutils-dev.files sidplay-libs-2.1.1/debian/libsidutils-dev.files
--- sidplay-libs-2.1.1/debian/libsidutils-dev.files 2012-02-07 02:43:48.000000000 +0400
+++ sidplay-libs-2.1.1/debian/libsidutils-dev.files 1970-01-01 03:00:00.000000000 +0300
@@ -1,4 +0,0 @@
-usr/include/sidplay/utils/*
-usr/lib/libsidutils*.a
-usr/lib/libsidutils*.so
-usr/lib/pkgconfig/libsidutils.pc
diff -Nru sidplay-libs-2.1.1/debian/libsidutils-dev.install sidplay-libs-2.1.1/debian/libsidutils-dev.install
--- sidplay-libs-2.1.1/debian/libsidutils-dev.install 1970-01-01 03:00:00.000000000 +0300
+++ sidplay-libs-2.1.1/debian/libsidutils-dev.install 2015-07-24 16:48:53.000000000 +0300
@@ -0,0 +1,4 @@
+usr/include/sidplay/utils/*
+usr/lib/*/libsidutils*.a
+usr/lib/*/libsidutils*.so
+usr/lib/*/pkgconfig/libsidutils.pc
diff -Nru sidplay-libs-2.1.1/debian/rules sidplay-libs-2.1.1/debian/rules
--- sidplay-libs-2.1.1/debian/rules 2012-02-17 17:13:09.000000000 +0400
+++ sidplay-libs-2.1.1/debian/rules 2015-07-24 17:40:49.000000000 +0300
@@ -1,133 +1,20 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export V=1
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- cd libsidplay && autoreconf -vfi
- cd libsidutils && autoreconf -vfi
- cd resid && autoreconf -vfi
- cd builders/hardsid-builder && autoreconf -vfi
- cd builders/resid-builder && autoreconf -vfi
- autoreconf -vfi
- ./configure --enable-shared --enable-static --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libdir=\$${prefix}/lib
- touch $@
-
-build-arch: build
-build-indep: build
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- $(MAKE)
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f confdefs.h config.log
- # remove autogenerated files
- find . -name aclocal.m4 -o -name configure -o -name configure.lineno \
- -o -name config.guess -o -name config.h.in \
- -o -name config.log -o -name config.status -o \
- -name config.sub -o -name depcomp -o -name install-sh -o \
- -name libtool -o -name ltmain.sh -o -name missing -o \
- -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 configure-stamp build-stamp
-
- dh_clean
-
-maintainerclean: clean
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
-
- set -e ; \
- p=`pwd` ; \
- for d in . libsidplay libsidutils resid builders/resid-builder ; do \
- echo $$d ; \
- cd $$p/$$d ; \
- libtoolize --force --copy ; \
- aclocal `test -d unix && echo -I unix` ; \
- automake --add-missing --copy || true ; \
- autoconf || true ; \
- done
-
-install: build
- dh_testdir
- dh_testroot
- dh_installdirs
-
- $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
- # 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/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 libsidplay2 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
- dh_installmenu
- dh_installcron
- dh_installman
- dh_installinfo
-
- 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
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@ --with autoreconf --parallel
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-shared --enable-static
+override_dh_installchangelogs:
+ dh_installchangelogs -plibsidplay2 libsidplay/ChangeLog
+ dh_installchangelogs -plibsidutils0 libsidutils/ChangeLog
+ dh_installchangelogs -Nlibsidplay2 -Nlibsidutils0
+override_dh_installdocs:
+ dh_installdocs -Nlibsidplay2-dev -Nlibsidutils-dev -Nlibresid-builder-dev
+ dh_installdocs -plibsidplay2-dev --link-doc=libsidplay2
+ dh_installdocs -plibsidutils-dev --link-doc=libsidutils0
+ dh_installdocs -plibresid-builder-dev --link-doc=libresid-builder0c2a
