Bug#637600: NMU diff for speex/1.2~rc1-3.1

[Bastian Blank]

Attached it the diff for speex/1.2~rc1-3.1.

Bastian

-- 
Intuition, however illogical, is recognized as a command prerogative.
		-- Kirk, "Obsession", stardate 3620.7
-------------- next part --------------
diff -u speex-1.2~rc1/debian/rules speex-1.2~rc1/debian/rules
--- speex-1.2~rc1/debian/rules
+++ speex-1.2~rc1/debian/rules
@@ -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 $@
 
diff -u speex-1.2~rc1/debian/control speex-1.2~rc1/debian/control
--- speex-1.2~rc1/debian/control
+++ speex-1.2~rc1/debian/control
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: Ron Lee <ron 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.9.2.0
 Homepage: http://www.speex.org/
@@ -11,6 +11,7 @@
 
 Package: speex
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}
 Description: The Speex codec command line tools
  Speex is an audio codec especially designed for compressing voice at low
@@ -23,6 +24,8 @@
 Package: libspeex1
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}
 Suggests: speex
 Conflicts: libopal-2.2 (<= 2.2.11~dfsg1-3),
@@ -43,6 +46,7 @@
 Package: libspeex-dev
 Architecture: any
 Section: libdevel
+Multi-Arch: same
 Depends: libspeex1 (= ${binary:Version})
 Suggests: pkg-config
 Description: The Speex codec library development files
@@ -56,6 +60,8 @@
 Package: libspeexdsp1
 Architecture: any
 Section: libs
+Multi-Arch: same
+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
@@ -69,6 +75,7 @@
 Package: libspeexdsp-dev
 Architecture: any
 Section: libdevel
+Multi-Arch: same
 Depends: libspeexdsp1 (= ${binary:Version}), libspeex-dev (= ${binary:Version})
 Suggests: pkg-config
 Description: The Speex extended library development files
diff -u speex-1.2~rc1/debian/libspeex-dev.install speex-1.2~rc1/debian/libspeex-dev.install
--- speex-1.2~rc1/debian/libspeex-dev.install
+++ speex-1.2~rc1/debian/libspeex-dev.install
@@ -8,3 +8,3 @@
-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
diff -u speex-1.2~rc1/debian/changelog speex-1.2~rc1/debian/changelog
--- speex-1.2~rc1/debian/changelog
+++ speex-1.2~rc1/debian/changelog
@@ -1,3 +1,14 @@
+speex (1.2~rc1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support multi-arch: (closes: #637600)
+    - Build-depend against newer debhelper
+    - Mark speex as foreign.
+    - Mark libspeex1, libspeex-dev, libspeexdsp1 and libspeexdsp-dev as same.
+    - Adjust installation directories.
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 11 May 2012 14:14:35 +0000
+
 speex (1.2~rc1-3) unstable; urgency=low
 
   * Work around extra dh_install retardedness that using a higher compat
diff -u speex-1.2~rc1/debian/libspeexdsp-dev.install speex-1.2~rc1/debian/libspeexdsp-dev.install
--- speex-1.2~rc1/debian/libspeexdsp-dev.install
+++ speex-1.2~rc1/debian/libspeexdsp-dev.install
@@ -6,3 +6,3 @@
-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