Bug#870676: ffmpeg requires NEON on armhf, which is not part of the ARMv7 ABI

2017-08-05 Thread Steve Langasek 
Control: forcemerge 870622 -1

Hi James,

On Sat, Aug 05, 2017 at 02:40:12PM -0400, James Cowgill wrote:

> > The latest release of ffmpeg enables NEON support by default when building
> > on armhf; however, NEON support is not a standard part of the ARMv7 ABI, and
> > Debian supports running armhf on chips that do not implement NEON.

> > Using NEON based on runtime detection of support for it is fine, but the
> > existing ffmpeg implementation doesn't appear to do this, instead using NEON
> > based on build-time configuration with no fallback.

> Are you sure this is true? I tried running the failing test on abel.d.o
> (which AFAIK does not have NEON) and harris (which does). The test only
> caused ffmpeg to crash on harris, which seems to suggest that the
> runtime NEON detection is working properly.

Nope, not sure at all, I only know what I saw from code inspection where I
failed to find where the code falls back on non-NEON systems.

I see you're right that abel does not have NEON (it's not exposed in
/proc/cpuinfo feature flags for the CPU), so if ffmpeg runs without crashing
there, I guess that's pretty clear evidence that there is a runtime fallback
that I overlooked.

> These are the commands to reproduce the autopkgtest fail if you want to
> try it:

> ffmpeg -f lavfi -i testsrc=s=32x32:d=0.1 -strict -2 -c:v libx264rgb -f avi 
> libx264rgb.avi -y -hide_banner -nostdin
> ffmpeg -strict -2 -i libx264rgb.avi -t 1 -c:v rawvideo -c:a pcm_s32le -f nut 
> /dev/null -y -hide_banner -nostdin

> > This issue was noticed in Ubuntu only because the autopkgtests for ffmpeg
> > and x264 triggered an unaligned access in the NEON code, which is *also* not
> > a portable assumption on armhf; however, if the NEON code had not had any
> > unaligned access, the fact that NEON was used would have gone unnoticed on
> > Ubuntu infrastructure.
> > 
> >   http://autopkgtest.ubuntu.com/packages/f/ffmpeg/artful/armhf
> >   http://autopkgtest.ubuntu.com/packages/x/x264/artful/armhf
> > 
> > (And if upstream does fix their code to support runtime detection of NEON
> > support, then there will be a different bug for us to worry about fixing!)
> 
> This is #870622 BTW. If possible, I would much rather fix these bugs
> without having to disable all the NEON optimizations.

So, marking this bug as a duplicate of the real bug (the unaligned trap
problem due to binutils).

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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org


signature.asc
Description: PGP signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#870676: ffmpeg requires NEON on armhf, which is not part of the ARMv7 ABI

2017-08-03 Thread Steve Langasek 
Package: ffmpeg
Version: 7:3.3.3-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch autopkgtest

Dear maintainers,

The latest release of ffmpeg enables NEON support by default when building
on armhf; however, NEON support is not a standard part of the ARMv7 ABI, and
Debian supports running armhf on chips that do not implement NEON.

Using NEON based on runtime detection of support for it is fine, but the
existing ffmpeg implementation doesn't appear to do this, instead using NEON
based on build-time configuration with no fallback.

This issue was noticed in Ubuntu only because the autopkgtests for ffmpeg
and x264 triggered an unaligned access in the NEON code, which is *also* not
a portable assumption on armhf; however, if the NEON code had not had any
unaligned access, the fact that NEON was used would have gone unnoticed on
Ubuntu infrastructure.

  http://autopkgtest.ubuntu.com/packages/f/ffmpeg/artful/armhf
  http://autopkgtest.ubuntu.com/packages/x/x264/artful/armhf

(And if upstream does fix their code to support runtime detection of NEON
support, then there will be a different bug for us to worry about fixing!)

Cheers,
-- 
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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru ffmpeg-3.3.3/debian/rules ffmpeg-3.3.3/debian/rules
--- ffmpeg-3.3.3/debian/rules   2017-08-01 07:33:41.0 -0700
+++ ffmpeg-3.3.3/debian/rules   2017-08-03 17:43:44.0 -0700
@@ -127,6 +127,14 @@
--enable-libiec61883
 endif
 
+# upstream does not implement runtime detection of NEON support at runtime;
+# therefore NEON must be disabled at build time.  (This also works around
+# the fact that the NEON implementation does unaligned access, which is not
+# a portable assumption for armhf.)
+ifeq ($(DEB_HOST_ARCH),armhf)
+   CONFIG += --disable-neon
+endif
+
 # Some build-dependencies are not installable on some architectures.
 ifeq (,$(filter $(DEB_HOST_ARCH),powerpcspe))
CONFIG_extra += --enable-netcdf
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#795316: jackd2: Suggestion to fix overly-liberal shlibs for libjacknet

2015-08-12 Thread Steve Langasek 
Package: jackd2
Version: 1.9.10+20140719git3eb0ae6a~dfsg-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear maintainer,

I know you've only just fixed the shlibs file to correct jackd2's FTBFS
failure, but I'd like to recommend a change to the shlibs handling.  As part
of preparing the g++5 ABI transition in Ubuntu, it came to light that:

 - libjacknet is a private library, and
 - its ABI is impacted by the g++5 ABI transition

So while the current shlibs fix the build failure, in the unlikely event
that something *did* link against libjacknet (unlikely because it's a
private library with no headers in the -dev package), that package would
have a wrong dependency, which would be satisfied by other versions of the
package with known-incompatible ABI.

The attached patch would generate more correct shlibs for the library in
question.  However, it seems to me that since this is a private library
anyway, a more correct solution might be to install it in the jackd2 binary
package instead of the library runtime package.

Thanks for considering the patch.
-- 
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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== removed file 'debian/libjack-jackd2-0.shlibs'
--- debian/libjack-jackd2-0.shlibs	2015-07-19 12:37:34 +
+++ debian/libjack-jackd2-0.shlibs	1970-01-01 00:00:00 +
@@ -1,2 +0,0 @@
-libjack 0 libjack-jackd2-0 (= 1.9.5~dfsg-14) | libjack-0.116
-libjacknet 0 libjack-jackd2-0 (= 1.9.5~dfsg-14)

=== added file 'debian/libjack-jackd2-0.shlibs.in'
--- debian/libjack-jackd2-0.shlibs.in	1970-01-01 00:00:00 +
+++ debian/libjack-jackd2-0.shlibs.in	2015-08-12 21:26:02 +
@@ -0,0 +1,2 @@
+libjack 0 libjack-jackd2-0 (= 1.9.5~dfsg-14) | libjack-0.116
+libjacknet 0 libjack-jackd2-0 (= ${DEB_VERSION})

=== modified file 'debian/rules'
--- debian/rules	2014-09-24 21:48:32 +
+++ debian/rules	2015-08-12 21:26:02 +
@@ -67,7 +67,7 @@
 DEB_PHONY_RULES += $(outfiles)
 pre-build:: $(outfiles)
 $(outfiles): update-config debian/stamp-copyright-check
-	sed 's/__ABI__/$(ABI)/' $@.in $@
+	sed 's/__ABI__/$(ABI)/; s/$${DEB_VERSION}/${DEB_VERSION}/g' $@.in $@
 clean::
 	rm -f $(outfiles)
 

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#756174: jackd2 building without any of the required build flags

2014-07-26 Thread Steve Langasek 
Package: jackd2
Version: 1.9.10+20140610git97e0e80b~dfsg-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch

The jackd2 package in Debian unstable does not properly pass dpkg-buildflags
values to waf.  As a result, the package is built without optimizations
(-O2), has no debugging symbols available at build time (-g), and doesn't
use any of the hardening flags that are exported by dpkg-buildflags by
default on Debian.

The first two of these are violation of a policy should (10.1), the last
is bad for the security of the package.

The attached patch is a minimally-invasive fix for this, which uses
DEB_MAKE_EXTRA_ARGS to pass the variables to waf.  However, waf is not make,
so this isn't strictly correct.  There is a waf class in cdbs (available
since cdbs 0.4.90); I don't know why you're not using it, perhaps you want
to switch to using that instead.

I would offer a patch to convert the package to dh(1), but considering the
contents of the Uploaders field I suspect it would not be accepted.

-- 
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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/rules'
--- debian/rules	2013-03-06 14:44:55 +
+++ debian/rules	2014-07-27 05:31:57 +
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+# Let's try to cut down noisy symbols to the official API
+export DEB_CFLAGS_MAINT_APPEND = -fvisibility=hidden
+export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden
+
 -include /usr/share/cdbs/1/rules/upstream-tarball.mk
 -include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -35,16 +39,12 @@
 # Minimum assured version referenced upstream as library API/ABI
 ABI = 0.118.0
 
-# Let's try to cut down noisy symbols to the official API
-CFLAGS += -fvisibility=hidden
-CXXFLAGS += -fvisibility=hidden
-
 waf-configure-options = --prefix=/usr --classic
 waf-configure-options += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 waf-configure-options += $(if $(filter linux,$(DEB_HOST_ARCH_OS)),--alsa --dbus)
 waf-configure-options += $(if $(filter amd64 i386 powerpc,$(DEB_HOST_ARCH)),--firewire)
 
-DEB_MAKE_INVOKE = ./waf-light -v --destdir=$(CURDIR)/debian/tmp
+DEB_MAKE_INVOKE = $(DEB_MAKE_EXTRA_ARGS) ./waf-light -v --destdir=$(CURDIR)/debian/tmp
 DEB_MAKE_INSTALL_TARGET = install
 
 # TODO: use distclean and drop related clean target, when (or if)
@@ -75,7 +75,7 @@
 common-configure-impl:: debian/stamp-waf-configure
 debian/stamp-waf-configure:
 	chmod +x ./waf-light
-	./waf-light configure $(waf-configure-options)
+	$(DEB_MAKE_EXTRA_ARGS) ./waf-light configure $(waf-configure-options)
 	touch $@
 clean::
 	rm -f debian/stamp-waf-configure

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#698019: libav: the effective GPL-licensed status of the binary packages should be clearly documented

2013-01-15 Thread Steve Langasek 
On Tue, Jan 15, 2013 at 02:41:07PM +0100, Jonas Smedegaard wrote:
 the current defined purpose of the copyright file apparently is only to
 cover copyrights and licensing or _source_.

That's not true.  The purpose of the copyright file has *always* been to
ensure that the license for a given binary package is correctly documented
in that package.  It's just that the safest way to ensure this is by
documenting the entire license for the source package in debian/copyright
and copying that file to each of the binary packages.  Unfortunately we took
a wrong turn somewhere and started considering debian/copyright itself the
requirement, and that's a *bug*.

-- 
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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#637861: Please transition rtmpdump for multiarch

2011-08-15 Thread Steve Langasek 
Package: rtmpdump
Version: 2.3-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 rtmpdump 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.

As a dependency of libcurl, librtmp0 is part of the stack packaged in
ia32-libs.  Converting rtmpdump for multiarch use, and thus facilitating the
direct installation of i386 packages on amd64 systems, will be a great step
forward in the release goal of getting rid of ia32-libs for wheezy.  So
please consider including this patch in Debian sooner rather than later.

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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/compat'
--- debian/compat   2010-06-03 20:53:02 +
+++ debian/compat   2011-08-15 09:13:51 +
@@ -1 +1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control  2010-08-01 08:59:47 +
+++ debian/control  2011-08-15 09:13:51 +
@@ -3,7 +3,7 @@
 Maintainer: Debian multimedia packages maintainers 
pkg-multimedia-maintainers@lists.alioth.debian.org
 Uploaders: Reinhard Tartler siret...@tauware.de, Sebastian Dröge 
sl...@debian.org,
Fabian Greffrath fabian+deb...@greffrath.com
-Build-Depends: quilt (= 0.46-7~), debhelper (= 7.0.50~), libgnutls-dev
+Build-Depends: quilt (= 0.46-7~), debhelper (= 8.1.3), libgnutls-dev
 Standards-Version: 3.9.0
 Section: web
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/rtmpdump.git
@@ -22,7 +22,9 @@
 Package: librtmp0
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
+Multi-Arch: same
 Description: toolkit for RTMP streams (shared library)
  A small dumper for media content streamed over the RTMP protocol (like BBC's
  iPlayer high quality streams). Supplying an rtmp url will result in a dumped

=== modified file 'debian/librtmp-dev.install'
--- debian/librtmp-dev.install  2010-07-05 19:57:14 +
+++ debian/librtmp-dev.install  2011-08-15 09:13:51 +
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*

=== modified file 'debian/librtmp0.install'
--- debian/librtmp0.install 2010-07-05 19:57:14 +
+++ debian/librtmp0.install 2011-08-15 09:13:51 +
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

=== modified file 'debian/rules'
--- debian/rules2010-07-05 19:57:14 +
+++ debian/rules2011-08-15 09:13:51 +
@@ -4,7 +4,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-MAKEVARS=prefix=/usr CRYPTO=GNUTLS
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+MAKEVARS=prefix=/usr CRYPTO=GNUTLS libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
dh_auto_build -- $(MAKEVARS)

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#637582: Please transition flac for multiarch

2011-08-12 Thread Steve Langasek 
Package: flac
Version: 1.2.1-4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

Hi folks,

Please find attached a patch to flac 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 flac is pretty low in the audio stack
included in ia32-libs, which we would like to get rid of for wheezy.

Note that I have examined the -dev packages and confirmed that they contain
no architecture-specific headers, so I have marked these packages
Multi-Arch: same in addition to the runtime library packages.

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 Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/compat'
--- debian/compat   2010-06-15 14:37:46 +
+++ debian/compat   2011-08-12 19:18:58 +
@@ -1 +1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control  2011-07-09 11:51:59 +
+++ debian/control  2011-08-12 19:18:58 +
@@ -5,7 +5,7 @@
 Uploaders: Joshua Kwan jo...@triplehelix.org,
  Fabian Greffrath fabian+deb...@greffrath.com
 Build-Depends: autotools-dev,
- debhelper (= 7.0.50~),
+ debhelper (= 8.1.3),
  dh-autoreconf,
  docbook-to-man,
  doxygen,
@@ -39,6 +40,8 @@
 Package: libflac8
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Free Lossless Audio Codec - runtime C library
@@ -78,6 +81,7 @@
 Package: libflac-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libflac8 (= ${binary:Version}),
  libogg-dev,
  ${misc:Depends}
@@ -98,6 +102,8 @@
 Package: libflac++6
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Free Lossless Audio Codec - C++ runtime library
@@ -117,6 +123,7 @@
 Package: libflac++-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libflac++6 (= ${binary:Version}),
  libflac-dev,
  ${misc:Depends}

=== modified file 'debian/libflac++-dev.install'
--- debian/libflac++-dev.install2011-07-09 11:51:59 +
+++ debian/libflac++-dev.install2011-08-12 19:18:58 +
@@ -1,5 +1,5 @@
-usr/lib/libFLAC++.a
-usr/lib/libFLAC++.so
-usr/lib/pkgconfig/flac++.pc
+usr/lib/*/libFLAC++.a
+usr/lib/*/libFLAC++.so
+usr/lib/*/pkgconfig/flac++.pc
 usr/include/FLAC++
 usr/share/aclocal/libFLAC++.m4

=== modified file 'debian/libflac++6.install'
--- debian/libflac++6.install   2007-05-29 22:56:36 +
+++ debian/libflac++6.install   2011-08-12 19:18:58 +
@@ -1 +1 @@
-usr/lib/libFLAC++.so.*
+usr/lib/*/libFLAC++.so.*

=== modified file 'debian/libflac-dev.install'
--- debian/libflac-dev.install  2011-07-09 11:51:59 +
+++ debian/libflac-dev.install  2011-08-12 19:18:58 +
@@ -1,5 +1,5 @@
-usr/lib/libFLAC.a
-usr/lib/libFLAC.so
+usr/lib/*/libFLAC.a
+usr/lib/*/libFLAC.so
 usr/include/FLAC
-usr/lib/pkgconfig/flac.pc
+usr/lib/*/pkgconfig/flac.pc
 usr/share/aclocal/libFLAC.m4

=== modified file 'debian/libflac8.install'
--- debian/libflac8.install 2007-05-29 22:56:36 +
+++ debian/libflac8.install 2011-08-12 19:18:58 +
@@ -1 +1 @@
-usr/lib/libFLAC.so.*
+usr/lib/*/libFLAC.so.*

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#637599: jack-audio-connection-kit: Please transition libjack0 for multiarch

2011-08-12 Thread Steve Langasek 
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 Developerhttp://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.0 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/control	2011-08-12 13:57:09.0 -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.0 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/control.in	2011-08-12 13:57:09.0 -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.0 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1-firewire.install	2011-08-12 13:57:09.0 -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.0 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/jackd1.install	2011-08-12 13:57:09.0 -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.0 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/libjack0.install	2011-08-12 13:57:09.0 -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.0 -0700
+++ jack-audio-connection-kit-0.121.0+svn4469/debian/libjack-dev.install	2011-08-12 13:57:09.0 -0700
@@ -1,5 +1,5 @@
 debian/tmp/usr/include
-debian/tmp/usr/lib