[SCM] libshout/master: Introduce MultiArch support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 45cf9ccb0dcd3aa09f2f8038a7085ec4434e0c71
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 9 11:13:21 2012 +0100

    Introduce MultiArch support.
    
    Closes: #652504
    Thanks: Steve Langasek

diff --git a/debian/control.in b/debian/control.in
index 092fc92..c5204e0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,6 +15,7 @@ Homepage: http://www.icecast.org/
 Package: libshout3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libshout3 (= ${binary:Version}),
  ${devlibs:Depends},
  ${misc:Depends},
@@ -38,6 +39,8 @@ Description: MP3/Ogg Vorbis broadcast streaming library (development)
 Package: libshout3
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: MP3/Ogg Vorbis broadcast streaming library
diff --git a/debian/libshout3-dev.install b/debian/libshout3-dev.install
index 1d86803..5c95e8e 100644
--- a/debian/libshout3-dev.install
+++ b/debian/libshout3-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/pkgconfig/*
 debian/tmp/usr/share/aclocal/shout.m4
diff --git a/debian/rules b/debian/rules
index 2438328..9419149 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+DH_COMPAT = 8.1.3
 -include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share//cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -33,7 +34,7 @@ devpkgname = lib$(stem)$(abi)-dev
 CDBS_BUILD_DEPENDS += , libogg-dev, libvorbis-dev, pkg-config, libtheora-dev, libspeex-dev
 
 # Needed at build time for our packaging
-CDBS_BUILD_DEPENDS += , d-shlibs
+CDBS_BUILD_DEPENDS += , d-shlibs (>= 0.48)
 
 # suppress optional build-dependencies
 CDBS_BUILD_DEPENDS_rules_upstream-tarball =
@@ -45,6 +46,8 @@ DEB_UPSTREAM_TARBALL_MD5 = 4f75fc9901c724b712c371c9a1e782d3
 
 DEB_INSTALL_EXAMPLES_$(devpkgname) = examples/example.c
 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
 # avoid unneeded .la file
 binary-post-install/$(libpkgname):: debian/stamp-local-strip-la
 debian/stamp-local-strip-la: binary-install/$(libpkgname)
@@ -58,9 +61,10 @@ clean::
 binary-post-install/$(libpkgname):: debian/stamp-local-shlibs-$(libname)
 debian/stamp-local-shlibs-$(libname): binary-install/$(libpkgname) debian/stamp-local-strip-la
 	d-shlibmove --commit \
+		--multiarch \
 		--override s/ld1-dev// \
 		--movedev "debian/tmp/usr/include/*" usr/include/ \
-		debian/tmp/usr/lib/$(libname).so
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(libname).so
 	touch $@
 clean::
 	rm -f debian/stamp-local-shlibs-$(libname)

-- 
libshout packaging