Bug#637861: Please transition rtmpdump for multiarch

[Steve Langasek]

Package: rtmpdump
Version: 2.3-2
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

Hi folks,

Please find attached a patch to rtmpdump to transition it to use of the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.  This patch has been
tested and included in Ubuntu Oneiric.

As a dependency of libcurl, librtmp0 is part of the stack packaged in
ia32-libs.  Converting rtmpdump for multiarch use, and thus facilitating the
direct installation of i386 packages on amd64 systems, will be a great step
forward in the release goal of getting rid of ia32-libs for wheezy.  So
please consider including this patch in Debian sooner rather than later.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file 'debian/compat'
--- debian/compat	2010-06-03 20:53:02 +0000
+++ debian/compat	2011-08-15 09:13:51 +0000
@@ -1 +1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2010-08-01 08:59:47 +0000
+++ debian/control	2011-08-15 09:13:51 +0000
@@ -3,7 +3,7 @@
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>, Sebastian Dr?ge <slomo at debian.org>,
            Fabian Greffrath <fabian+debian at greffrath.com>
-Build-Depends: quilt (>= 0.46-7~), debhelper (>= 7.0.50~), libgnutls-dev
+Build-Depends: quilt (>= 0.46-7~), debhelper (>= 8.1.3), libgnutls-dev
 Standards-Version: 3.9.0
 Section: web
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/rtmpdump.git
@@ -22,7 +22,9 @@
 Package: librtmp0
 Section: libs
 Depends: ${shlibs:Depends}, ${misc: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

=== modified file 'debian/librtmp-dev.install'
--- debian/librtmp-dev.install	2010-07-05 19:57:14 +0000
+++ debian/librtmp-dev.install	2011-08-15 09:13:51 +0000
@@ -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/*

=== modified file 'debian/librtmp0.install'
--- debian/librtmp0.install	2010-07-05 19:57:14 +0000
+++ debian/librtmp0.install	2011-08-15 09:13:51 +0000
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

=== modified file 'debian/rules'
--- debian/rules	2010-07-05 19:57:14 +0000
+++ debian/rules	2011-08-15 09:13:51 +0000
@@ -4,7 +4,9 @@
 # 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)