[SCM] mpeg2dec/master: Introduce Multiarch support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c75a29bd9b328d37ecc084fbd27f49d4bc98b0df
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Feb 14 20:25:50 2012 +0100

    Introduce Multiarch support.

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 5d9a3d1..d8c5f07 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: Loic Minier <lool at dooz.org>,
            David I. Lehn <dlehn at debian.org>,
            Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Build-Depends: autotools-dev,
-               cdbs (>= 0.4.41),
-               debhelper (>= 5),
-               dpkg-dev (>= 1.13.19),
+               cdbs (>= 0.4.93~),
+               debhelper (>= 9),
+               dpkg-dev (>= 1.16.0),
                gnome-pkg-tools (>= 0.7),
                libsdl1.2-dev (>= 1.2.3),
                libx11-dev,
diff --git a/debian/libmpeg2-4-dev.install b/debian/libmpeg2-4-dev.install
index b1f733e..bbe9590 100644
--- a/debian/libmpeg2-4-dev.install
+++ b/debian/libmpeg2-4-dev.install
@@ -1,8 +1,8 @@
 usr/include/mpeg2dec/mpeg2.h
 usr/include/mpeg2dec/mpeg2convert.h
-usr/lib/libmpeg2.a
-usr/lib/libmpeg2.so
-usr/lib/libmpeg2convert.a
-usr/lib/libmpeg2convert.so
-usr/lib/pkgconfig/libmpeg2.pc
-usr/lib/pkgconfig/libmpeg2convert.pc
+usr/lib/*/libmpeg2.a
+usr/lib/*/libmpeg2.so
+usr/lib/*/libmpeg2convert.a
+usr/lib/*/libmpeg2convert.so
+usr/lib/*/pkgconfig/libmpeg2.pc
+usr/lib/*/pkgconfig/libmpeg2convert.pc
diff --git a/debian/libmpeg2-4.install b/debian/libmpeg2-4.install
index 42031ad..92bcfda 100644
--- a/debian/libmpeg2-4.install
+++ b/debian/libmpeg2-4.install
@@ -1,2 +1,2 @@
-usr/lib/libmpeg2.so.*
-usr/lib/libmpeg2convert.so.*
+usr/lib/*/libmpeg2.so.*
+usr/lib/*/libmpeg2convert.so.*
diff --git a/debian/rules b/debian/rules
index 2b04aef..ed87c39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 # leave it to the upstream configure to select the opt flag, presumably -O3
@@ -50,7 +52,8 @@ endif
 libmpeg2N := $(shell sed -rn 's/^Package:[[:space:]]*(libmpeg2-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-shared
-DEB_SHLIBDEPS_INCLUDE += debian/$(libmpeg2N)/usr/lib
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+DEB_SHLIBDEPS_INCLUDE += debian/$(libmpeg2N)/usr/lib/$(DEB_HOST_MULTIARCH)
 DEB_AC_AUX_DIR := autotools
 DEB_DH_INSTALL_ARGS += --sourcedir=debian/tmp
 

-- 
mpeg2dec packaging