Package: libsoundtouch0
Version: 1.6.0-1.2
Severity: normal
Tags: patch
--- Please enter the report below this line. ---
Dears Maintainers,
Could you support multiarch : same for libsoundtouch package.
http://wiki.debian.org/Multiarch/Implementation
I attach 2 patches.
1/ multiarch_soundtouch_v8.patch
* Drop lib32 package. No package depends on it. So it can directly
replaced by libsoundtouch0:i386. Be aware that current dpkg version
does not support fully multiarch (only a dev branch, Ubuntu is fine)
and therefore it will not possible to install libsoundtouch0:i386 on a
default Debian.
* Bump debhhelper version, add multiarch specific field in control files
* move /usr/lib/* to /usr/lib/$DEB_HOST_MULTIARCH/
2/ multiarch_soundtouch_v8_to_v9.patch
For the moment, debhelper v9 compatibility is experimental but it
reduces multiarch work. This patch is optional. The intent was to show
you the impact of debhelper v9.
Best regards,
Gregory
diff -Nru soundtouch-1.6.0/debian/changelog soundtouch-1.6.0/debian/changelog
--- soundtouch-1.6.0/debian/changelog 2011-07-17 11:22:05.000000000 +0200
+++ soundtouch-1.6.0/debian/changelog 2011-07-20 22:36:19.000000000 +0200
@@ -1,3 +1,10 @@
+soundtouch (1.6.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build for Multiarch. Drop lib32*
+
+ -- Gregory Hainaut <gregory.hain...@gmail.com> Wed, 20 Jul 2011 22:36:12 +0200
+
soundtouch (1.6.0-1) unstable; urgency=low
[ Alessio Treglia ]
diff -Nru soundtouch-1.6.0/debian/control soundtouch-1.6.0/debian/control
--- soundtouch-1.6.0/debian/control 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/control 2011-07-20 22:38:49.000000000 +0200
@@ -4,9 +4,8 @@
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintain...@lists.alioth.debian.org>
Uploaders: Alessio Treglia <ales...@debian.org>,
Miguel Colon <debian.mic...@gmail.com>
-Build-Depends: debhelper (>= 8.0.0~),
- dh-autoreconf,
- g++-multilib [amd64]
+Build-Depends: debhelper (>= 8.1.3),
+ dh-autoreconf
Standards-Version: 3.9.2
Homepage: http://www.surina.net/soundtouch/
Vcs-Git: git://git.debian.org/pkg-multimedia/soundtouch.git
@@ -30,6 +29,8 @@
Package: libsoundtouch0
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Sound stretching library
@@ -42,6 +43,7 @@
Priority: extra
Section: debug
Architecture: any
+Multi-Arch: same
Depends: libsoundtouch0 (= ${binary:Version}),
${misc:Depends}
Description: Debugging symbols for the sound stretching library
@@ -50,43 +52,6 @@
.
This package contains the debugging symbols for libsoundtouch0.
-Package: lib32soundtouch-dev
-Section: libdevel
-Architecture: amd64
-Depends: libsoundtouch-dev (= ${binary:Version}),
- lib32soundtouch0 (= ${binary:Version}),
- ${misc:Depends}
-Provides: lib32soundtouch0-dev
-Description: Development files for the sound stretching library (32 bit)
- SoundTouch is a library that can be used to change pitch and time of
- soundfiles independently.
- .
- This package contains the development files (32 bit) used to build programs
- that use lib32soundtouch0.
-
-Package: lib32soundtouch0
-Architecture: amd64
-Depends: libsoundtouch0 (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Description: Sound stretching library (32 bit)
- SoundTouch is a library that can be used to change pitch and time
- of soundfiles independently.
- .
- This package contains the libsoundtouch0 shared library (32 bit).
-
-Package: lib32soundtouch0-dbg
-Priority: extra
-Section: debug
-Architecture: amd64
-Depends: lib32soundtouch0 (= ${binary:Version}),
- ${misc:Depends}
-Description: Debugging symbols for the sound stretching library (32 bit)
- SoundTouch is a library that can be used to change pitch and time of
- soundfiles independently.
- .
- This package contains the debugging symbols (32 bit) for lib32soundtouch0.
-
Package: soundstretch
Section: sound
Architecture: any
diff -Nru soundtouch-1.6.0/debian/lib32soundtouch0-dbg.links soundtouch-1.6.0/debian/lib32soundtouch0-dbg.links
--- soundtouch-1.6.0/debian/lib32soundtouch0-dbg.links 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/lib32soundtouch0-dbg.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/lib32soundtouch0 /usr/share/doc/lib32soundtouch0-dbg
diff -Nru soundtouch-1.6.0/debian/lib32soundtouch0.install soundtouch-1.6.0/debian/lib32soundtouch0.install
--- soundtouch-1.6.0/debian/lib32soundtouch0.install 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/lib32soundtouch0.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib32/lib*.so.* /usr/lib32/
diff -Nru soundtouch-1.6.0/debian/lib32soundtouch0.links soundtouch-1.6.0/debian/lib32soundtouch0.links
--- soundtouch-1.6.0/debian/lib32soundtouch0.links 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/lib32soundtouch0.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/libsoundtouch0 /usr/share/doc/lib32soundtouch0
diff -Nru soundtouch-1.6.0/debian/lib32soundtouch-dev.install soundtouch-1.6.0/debian/lib32soundtouch-dev.install
--- soundtouch-1.6.0/debian/lib32soundtouch-dev.install 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/lib32soundtouch-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib32/lib*.so /usr/lib32/
-usr/lib32/pkgconfig/* /usr/lib32/pkgconfig/
diff -Nru soundtouch-1.6.0/debian/lib32soundtouch-dev.links soundtouch-1.6.0/debian/lib32soundtouch-dev.links
--- soundtouch-1.6.0/debian/lib32soundtouch-dev.links 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/lib32soundtouch-dev.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/doc/libsoundtouch-dev /usr/share/doc/lib32soundtouch-dev
diff -Nru soundtouch-1.6.0/debian/libsoundtouch0.install soundtouch-1.6.0/debian/libsoundtouch0.install
--- soundtouch-1.6.0/debian/libsoundtouch0.install 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/libsoundtouch0.install 2011-07-20 20:33:26.000000000 +0200
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -Nru soundtouch-1.6.0/debian/libsoundtouch-dev.install soundtouch-1.6.0/debian/libsoundtouch-dev.install
--- soundtouch-1.6.0/debian/libsoundtouch-dev.install 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/libsoundtouch-dev.install 2011-07-20 20:33:26.000000000 +0200
@@ -1,4 +1,4 @@
usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
usr/share/aclocal/*
diff -Nru soundtouch-1.6.0/debian/rules soundtouch-1.6.0/debian/rules
--- soundtouch-1.6.0/debian/rules 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/rules 2011-07-20 20:31:20.000000000 +0200
@@ -2,26 +2,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
override_dh_auto_configure:
- ifeq ($(DEB_HOST_ARCH), amd64)
- dh_auto_configure -- CC='gcc -m32' CXX='g++ -m32' \
- --enable-shared=yes \
- --bindir=\$${prefix}/bin32 \
- --libexecdir=\$${prefix}/lib32/soundtouch \
- --libdir=\$${prefix}/lib32
- $(MAKE)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) clean
- endif
-
- dh_auto_configure -- --enable-shared=yes
-
-ifeq ($(DEB_HOST_ARCH), amd64)
-override_dh_prep:
- dh_prep --exclude=debian/tmp
-endif
+ dh_auto_configure -- --enable-shared=yes --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
override_dh_installdocs:
dh_installdocs -plibsoundtouch0 -psoundstretch
@@ -31,9 +15,6 @@
override_dh_strip:
dh_strip --package=libsoundtouch0 --dbg-package=libsoundtouch0-dbg
- ifeq ($(DEB_HOST_ARCH), amd64)
- dh_strip --package=lib32soundtouch0 --dbg-package=lib32soundtouch0-dbg
- endif
dh_strip --package=soundstretch --dbg-package=soundstretch-dbg
%:
diff -Nru soundtouch-1.6.0/debian/changelog soundtouch-1.6.0/debian/changelog
--- soundtouch-1.6.0/debian/changelog 2011-07-20 22:36:19.000000000 +0200
+++ soundtouch-1.6.0/debian/changelog 2011-07-20 22:44:48.000000000 +0200
@@ -1,3 +1,10 @@
+soundtouch (1.6.0-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Bump debhelper to version 9 (multiarch)
+
+ -- Gregory Hainaut <gregory.hain...@gmail.com> Wed, 20 Jul 2011 22:44:16 +0200
+
soundtouch (1.6.0-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru soundtouch-1.6.0/debian/compat soundtouch-1.6.0/debian/compat
--- soundtouch-1.6.0/debian/compat 2011-07-17 11:13:28.000000000 +0200
+++ soundtouch-1.6.0/debian/compat 2011-07-20 22:45:03.000000000 +0200
@@ -1 +1 @@
-8
+9
diff -Nru soundtouch-1.6.0/debian/rules soundtouch-1.6.0/debian/rules
--- soundtouch-1.6.0/debian/rules 2011-07-20 20:31:20.000000000 +0200
+++ soundtouch-1.6.0/debian/rules 2011-07-20 22:44:56.000000000 +0200
@@ -2,10 +2,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
override_dh_auto_configure:
- dh_auto_configure -- --enable-shared=yes --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_auto_configure -- --enable-shared=yes
override_dh_installdocs:
dh_installdocs -plibsoundtouch0 -psoundstretch
