Hello: I updated the patch for the changes in 1.2~rc1-3 and it should apply cleanly now. It takes into account the small changes to the control file and the removal of the *.install but it should be equivalent.
The new -dbg package could not be made multiarch since it contains the dbg for the libraries and the binaries (sort of misleading). If the binaries had their own -dbg package, libspeex-dbg could be made Multi-Arch: same. -Miguel
=== modified file 'debian/control' --- debian/control 2010-03-29 15:13:22 +0000 +++ debian/control 2011-08-12 18:52:22 +0000 @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Ron Lee <r...@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.9.2.0 Homepage: http://www.speex.org/ @@ -22,7 +22,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), @@ -42,6 +44,7 @@ Package: libspeex-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: libspeex1 (= ${binary:Version}) Suggests: pkg-config @@ -55,7 +58,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 @@ -68,6 +73,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/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/rules' --- debian/rules 2010-03-29 15:13:22 +0000 +++ debian/rules 2011-08-12 18:53:30 +0000 @@ -25,6 +25,7 @@ DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) objdir = objs @@ -69,6 +70,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 @@ -93,11 +95,11 @@ 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 - dh_install -plibspeex1 $(objdir)/libspeex/.libs/libspeex.so.* usr/lib - dh_install -plibspeexdsp1 $(objdir)/libspeex/.libs/libspeexdsp.so.* usr/lib + dh_install -plibspeex1 $(objdir)/libspeex/.libs/libspeex.so.* usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -plibspeexdsp1 $(objdir)/libspeex/.libs/libspeexdsp.so.* usr/lib/$(DEB_HOST_MULTIARCH) dh_install -plibspeex-dev -plibspeexdsp-dev -pspeex --sourcedir=debian/tmp touch $@
