Package: jack-audio-connection-kit
Version: 1:0.121.0+svn4469-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi folks,
Please find attached a patch to jack-audio-connection-kit to transition it
to use of the multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>. This patch has been
tested and included in Ubuntu Oneiric. I would encourage you to apply this
patch in Debian as well, since jack-audio-connection-kit is part of the
audio stack included in ia32-libs, which we would like to get rid of for
wheezy.
Note that this patch also drops the build-dependency on dh-buildinfo,
because this tool is not multiarch-safe; it creates a file,
/usr/share/doc/libjack0/buildinfo.gz, which is different for each build.
Since Ubuntu only allows sourceful uploads, all the build information is
always available from the autobuilder build logs. In Debian you may prefer
to fix dh-buildinfo to output this information with an
architecture-qualified filename.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru jack-audio-connection-kit-0.121.0+svn4469/debian/control jack-audio-connection-kit-0.121.0+svn4469/debian/control
--- jack-audio-connection-kit-0.121.0+svn4469/debian/control 2011-06-23 16:17:55.000000000 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/control 2011-08-12 13:57:09.000000000 -0700
@@ -10,9 +10,8 @@
Build-Depends: libtool,
automake1.11,
autoconf,
- cdbs (>= 0.4.85~),
- debhelper (>= 7.0.1),
- dh-buildinfo,
+ cdbs (>= 0.4.93~),
+ debhelper (>= 8.1.3),
d-shlibs,
doxygen,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
@@ -58,7 +57,9 @@
Package: libjack0
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Conflicts: jackd1 (<< ${binary:Version}),
diff -Nru jack-audio-connection-kit-0.121.0+svn4469/debian/control.in jack-audio-connection-kit-0.121.0+svn4469/debian/control.in
--- jack-audio-connection-kit-0.121.0+svn4469/debian/control.in 2011-06-23 14:56:32.000000000 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/control.in 2011-08-12 13:57:09.000000000 -0700
@@ -53,7 +53,9 @@
Package: libjack0
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Conflicts: jackd1 (<< ${binary:Version}),
diff -Nru jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1-firewire.install jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1-firewire.install
--- jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1-firewire.install 2011-06-23 09:22:16.000000000 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1-firewire.install 2011-08-12 13:57:09.000000000 -0700
@@ -1 +1 @@
-debian/tmp/usr/lib/jack/jack_firewire.so
+debian/tmp/usr/lib/*/jack/jack_firewire.so
diff -Nru jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1.install jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1.install
--- jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1.install 2011-06-23 09:22:16.000000000 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1.install 2011-08-12 13:57:09.000000000 -0700
@@ -1,10 +1,10 @@
debian/tmp/usr/bin/jack*
-debian/tmp/usr/lib/libjackserver.so.*
-debian/tmp/usr/lib/jack/inprocess.so
-debian/tmp/usr/lib/jack/intime.so
-debian/tmp/usr/lib/jack/jack_dummy.so
-debian/tmp/usr/lib/jack/jack_net.so
-debian/tmp/usr/lib/jack/jack_oss.so
+debian/tmp/usr/lib/*/libjackserver.so.*
+debian/tmp/usr/lib/*/jack/inprocess.so
+debian/tmp/usr/lib/*/jack/intime.so
+debian/tmp/usr/lib/*/jack/jack_dummy.so
+debian/tmp/usr/lib/*/jack/jack_net.so
+debian/tmp/usr/lib/*/jack/jack_oss.so
debian/bash_completion.d etc
debian/audio.conf etc/security/limits.d
debian/audio.conf usr/share/jackd
diff -Nru jack-audio-connection-kit-0.121.0+svn4469/debian/libjack0.install jack-audio-connection-kit-0.121.0+svn4469/debian/libjack0.install
--- jack-audio-connection-kit-0.121.0+svn4469/debian/libjack0.install 2011-06-23 09:22:16.000000000 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/libjack0.install 2011-08-12 13:57:09.000000000 -0700
@@ -1 +1 @@
-debian/tmp/usr/lib/libjack.so.*
+debian/tmp/usr/lib/*/libjack.so.*
diff -Nru jack-audio-connection-kit-0.121.0+svn4469/debian/libjack-dev.install jack-audio-connection-kit-0.121.0+svn4469/debian/libjack-dev.install
--- jack-audio-connection-kit-0.121.0+svn4469/debian/libjack-dev.install 2011-06-23 09:22:16.000000000 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/libjack-dev.install 2011-08-12 13:57:09.000000000 -0700
@@ -1,5 +1,5 @@
debian/tmp/usr/include
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
+debian/tmp/usr/lib/*/pkgconfig
debian/tmp/usr/share/jack-audio-connection-kit/reference/html/* usr/share/doc/libjack-dev/HTML
diff -Nru jack-audio-connection-kit-0.121.0+svn4469/debian/rules jack-audio-connection-kit-0.121.0+svn4469/debian/rules
--- jack-audio-connection-kit-0.121.0+svn4469/debian/rules 2011-06-23 16:15:06.000000000 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/rules 2011-08-12 13:57:09.000000000 -0700
@@ -31,6 +31,7 @@
#unused, TODO get this soname from configure.in
#DEB_SONAME_VERSION := 0.91.1-0
DEB_CONFIGURE_EXTRA_FLAGS := --enable-resize \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--enable-timestamps --disable-iec61883 --with-oldtrans \
--disable-ensure-mlock --enable-sse=yes --enable-static=yes
# --enable-posix-shm
@@ -93,7 +94,7 @@
install/jackd1::
dh_install -pjackd1 debian/tmp/usr/bin/alsa_in
dh_install -pjackd1 debian/tmp/usr/bin/alsa_out
- dh_install -pjackd1 debian/tmp/usr/lib/jack/jack_alsa.so
+ dh_install -pjackd1 debian/tmp/usr/lib/*/jack/jack_alsa.so
endif
.PHONY: faq
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
