Bug#637600: Please transition speex for multiarch

[Steve Langasek]

Package: speex
Version: 1.2~rc1-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

Hi folks,

Please find attached a patch to speex 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 it in
Debian as well, since speex is part of 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 Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file 'debian/control'
--- debian/control	2010-03-29 15:13:22 +0000
+++ debian/control	2011-08-12 18:52:22 +0000
@@ -6,7 +6,7 @@
 Uploaders: Ron Lee <ron at debian.org>,
            Mark Purcell <msp at debian.org>,
            Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>> 4.1.0), libogg-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>> 8.1.3), libogg-dev, dpkg-dev (>= 1.13.19)
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.8.0
 Homepage: http://www.speex.org/
@@ -26,7 +26,9 @@
 
 Package: libspeex1
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}
 Suggests: speex
 Conflicts: libopal-2.2 (<= 2.2.11~dfsg1-3),
@@ -46,6 +48,7 @@
 
 Package: libspeex-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libspeex1 (= ${binary:Version})
 Suggests: pkg-config
@@ -59,7 +62,9 @@
 
 Package: libspeexdsp1
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}
 Description: The Speex extended runtime library
  Speex is an audio codec especially designed for compressing voice at low
@@ -72,6 +77,7 @@
 
 Package: libspeexdsp-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libspeexdsp1 (= ${binary:Version}), libspeex-dev (= ${binary:Version})
 Suggests: pkg-config

=== modified file 'debian/libspeex-dev.install'
--- debian/libspeex-dev.install	2008-04-14 23:22:26 +0000
+++ debian/libspeex-dev.install	2011-08-12 18:53:55 +0000
@@ -5,6 +5,6 @@
 usr/include/speex/speex_header.h
 usr/include/speex/speex_stereo.h
 usr/include/speex/speex_types.h
-usr/lib/libspeex.a
-usr/lib/libspeex.so
-usr/lib/pkgconfig/speex.pc
+usr/lib/*/libspeex.a
+usr/lib/*/libspeex.so
+usr/lib/*/pkgconfig/speex.pc

=== modified file 'debian/libspeex1.install'
--- debian/libspeex1.install	2008-04-14 23:22:26 +0000
+++ debian/libspeex1.install	2011-08-12 18:53:55 +0000
@@ -1 +1 @@
-usr/lib/libspeex.so.*
+usr/lib/*/libspeex.so.*

=== modified file 'debian/libspeexdsp-dev.install'
--- debian/libspeexdsp-dev.install	2008-04-14 23:22:26 +0000
+++ debian/libspeexdsp-dev.install	2011-08-12 18:53:55 +0000
@@ -3,6 +3,6 @@
 usr/include/speex/speex_jitter.h
 usr/include/speex/speex_preprocess.h
 usr/include/speex/speex_resampler.h
-usr/lib/libspeexdsp.a
-usr/lib/libspeexdsp.so
-usr/lib/pkgconfig/speexdsp.pc
+usr/lib/*/libspeexdsp.a
+usr/lib/*/libspeexdsp.so
+usr/lib/*/pkgconfig/speexdsp.pc

=== modified file 'debian/libspeexdsp1.install'
--- debian/libspeexdsp1.install	2008-04-14 23:22:26 +0000
+++ debian/libspeexdsp1.install	2011-08-12 18:53:55 +0000
@@ -1,2 +1,2 @@
-usr/lib/libspeexdsp.so.*
+usr/lib/*/libspeexdsp.so.*
 

=== modified file 'debian/rules'
--- debian/rules	2010-03-29 15:13:22 +0000
+++ debian/rules	2011-08-12 18:53:30 +0000
@@ -19,6 +19,7 @@
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 
 objdir            = objs
@@ -54,6 +55,7 @@
 	cd $* && ../configure --host=$(DEB_HOST_GNU_TYPE)	\
 			      --build=$(DEB_BUILD_GNU_TYPE)	\
 			      --prefix=/usr			\
+			      --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 			      $(EXTRA_CONFIG_FLAGS)
 
 build: build-arch
@@ -78,8 +80,8 @@
 	dh_testdir
 	cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	if [ -d "$(objdir_sse)" ]; then								  \
-	    dh_install -plibspeex1    $(objdir_sse)/libspeex/.libs/libspeex.so.*    usr/lib/sse2; \
-	    dh_install -plibspeexdsp1 $(objdir_sse)/libspeex/.libs/libspeexdsp.so.* usr/lib/sse2; \
+	    dh_install -plibspeex1    $(objdir_sse)/libspeex/.libs/libspeex.so.*    usr/lib/$(DEB_HOST_MULTIARCH)/sse2; \
+	    dh_install -plibspeexdsp1 $(objdir_sse)/libspeex/.libs/libspeexdsp.so.* usr/lib/$(DEB_HOST_MULTIARCH)/sse2; \
 	fi
 	touch $@