[SCM] mpg123/master: Convert to Multi-Arch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bc27f9b24256763a9d15f02b2eb28bf54c092f6f
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 27 12:30:44 2012 +0200

    Convert to Multi-Arch.
    
    Closes: #651014

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 c0b6e77..da90988 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  autoconf,
  automake,
  autotools-dev,
- debhelper (>> 5),
+ debhelper (>= 9),
  libasound2-dev [linux-any],
  libaudio-dev,
  libjack-dev,
@@ -54,8 +54,10 @@ Description: MPEG layer 1/2/3 audio player
  and others.
 
 Package: libmpg123-0
+Multi-Arch: same
 Architecture: any
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -71,6 +73,7 @@ Description: MPEG layer 1/2/3 audio decoder -- runtime library
  the mpg123 library.
 
 Package: libmpg123-dev
+Multi-Arch: same
 Architecture: any
 Section: libdevel
 Depends:
diff --git a/debian/libmpg123-0.install b/debian/libmpg123-0.install
index 9c1b219..f1c83e6 100644
--- a/debian/libmpg123-0.install
+++ b/debian/libmpg123-0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libmpg123.so.0*
+debian/tmp/usr/lib/*/libmpg123.so.0*
diff --git a/debian/libmpg123-dev.install b/debian/libmpg123-dev.install
index 8ff3625..a3471b5 100644
--- a/debian/libmpg123-dev.install
+++ b/debian/libmpg123-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/*.h
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/pkgconfig/libmpg123.pc
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/pkgconfig/libmpg123.pc
diff --git a/debian/mpg123.install b/debian/mpg123.install
index 5a119da..6f2fcd6 100644
--- a/debian/mpg123.install
+++ b/debian/mpg123.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin/*
-debian/tmp/usr/lib/mpg123/*.so
+debian/tmp/usr/lib/*/mpg123/*.so
 debian/tmp/usr/share/man/*/*
diff --git a/debian/rules b/debian/rules
index 5a1c550..bcf262c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ PACKAGE:=mpg123
 ARCH:=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 OS:=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 CPU:=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 WRAPPER_TARGETS:=mpg123-oss mpg123-nas
 
@@ -16,7 +17,7 @@ ifeq ($(OS),linux)
 WRAPPER_TARGETS += mpg123-alsa
 endif
 
-CONF_COMMON:=--prefix=/usr --enable-static --enable-shared --disable-ltdl-install
+CONF_COMMON:=--prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --enable-static --enable-shared --disable-ltdl-install
 
 CONF_i486:=--with-cpu=x86_dither
 CONF_arm:=--with-cpu=generic_nofpu
@@ -168,12 +169,12 @@ install: build
 	dh_fixperms $(ALL_PKGSTR) $(DUMMY_PKGSTR)
 	dh_makeshlibs $(LIB_PKGSTR) -V "$(LIB_PKG) (>= 1.7.2)"
 	dh_installdeb $(ALL_PKGSTR)
-	dh_shlibdeps $(ALL_PKGSTR) -Xdebian/mpg123/usr/lib/mpg123/ -- \
-		-dSuggests `find debian/mpg123/usr/lib/mpg123/ -name "output_*.so" -type f` -dDepends
+	dh_shlibdeps $(ALL_PKGSTR) -Xdebian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/ -- \
+		-dSuggests `find debian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/ -name "output_*.so" -type f` -dDepends
 	for n in alsa dummy nas oss; do \
-		i="debian/mpg123/usr/lib/mpg123/output_$$n.so"; \
+		i="debian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/output_$$n.so"; \
 		test -e "$$i" || continue; \
-		dh_shlibdeps $(ARCH_PKGSTR) $(DUMMY_PKGSTR) -Xdebian/mpg123/usr/lib/mpg123 debian/mpg123 -- -p"$$n"plugin -dRecommends "$$i" -dDepends; \
+		dh_shlibdeps $(ARCH_PKGSTR) $(DUMMY_PKGSTR) -Xdebian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123 debian/mpg123 -- -p"$$n"plugin -dRecommends "$$i" -dDepends; \
 	done
 	chmod +x "$(CURDIR)/debian/alt_deps.py"
 	"$(CURDIR)/debian/alt_deps.py" "$(CURDIR)/debian/mpg123.substvars" \

-- 
mpg123 packaging