[SCM] rtmpdump/master: Enable multiarch, thanks to Steve Langasek for the patch (Closes: #637861).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b03e12066286519b4f8006e6f6591d7fd5cce209
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 17 12:14:55 2011 +0200

    Enable multiarch, thanks to Steve Langasek for the patch (Closes: #637861).

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 736c146..e71235b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders:
  Reinhard Tartler <siretart at tauware.de>,
  Sebastian Dröge <slomo at debian.org>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1.3),
  libgnutls-dev (>= 2.4.1)
 Standards-Version: 3.9.2
 Section: web
@@ -25,7 +25,9 @@ Description: small dumper for media content streamed over the RTMP protocol
 Package: librtmp0
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Architecture: any
+Multi-Arch: same
 Description: toolkit for RTMP streams (shared library)
  A small dumper for media content streamed over the RTMP protocol (like BBC's
  iPlayer high quality streams). Supplying an rtmp URL will result in a dumped
diff --git a/debian/librtmp-dev.install b/debian/librtmp-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/librtmp-dev.install
+++ b/debian/librtmp-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/librtmp0.install b/debian/librtmp0.install
index d0dbfd1..3ddde58 100644
--- a/debian/librtmp0.install
+++ b/debian/librtmp0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index b932f16..fd16a5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-MAKEVARS=prefix=/usr CRYPTO=GNUTLS
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+MAKEVARS=prefix=/usr CRYPTO=GNUTLS libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
 	dh_auto_build -- $(MAKEVARS)

-- 
rtmpdump packaging