[Pkg-gstreamer-commits] [SCM] GStreamer FFmpeg plugin 0.10 Packaging branch, master, updated. debian/0.10.13-3-2-g16c79e5

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 16c79e5b75912a38e9bf3898054df225a6df6c25
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Apr 23 09:12:55 2012 +0200

    * debian/control, debian/gstreamer0.10-ffmpeg.install, debian/rules: Transition package to multi-arch (Closes: #647490)

diff --git a/debian/changelog b/debian/changelog
index 5e3da10..11865c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gstreamer0.10-ffmpeg (0.10.13-5) unstable; urgency=low
+
+  * debian/control,
+    debian/gstreamer0.10-ffmpeg.install,
+    debian/rules:
+    + Transition package to multi-arch (Closes: #647490).
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 23 Apr 2012 09:12:13 +0200
+
 gstreamer0.10-ffmpeg (0.10.13-4) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 281d757..66917fe 100644
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,17 @@ Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintainers at lists.a
 Uploaders: Loic Minier <lool at dooz.org>,
            Sebastian Dröge <slomo at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 7),
-               cdbs (>= 0.4.8),
+Build-Depends: debhelper (>= 8.1.3),
+               cdbs (>= 0.4.93),
                dpkg-dev (>= 1.15.1),
                autotools-dev,
                zlib1g-dev,
                libglib2.0-dev (>= 2.4.0),
                pkg-config (>= 0.11.0),
-               libgstreamer0.10-dev (>= 0.10.31),
-               libgstreamer-plugins-base0.10-dev (>= 0.10.31),
+               libgstreamer0.10-dev (>= 0.10.36),
+               libgstreamer-plugins-base0.10-dev (>= 0.10.36),
                liborc-0.4-dev (>= 1:0.4.6),
-               gstreamer-tools (>= 0.10.14),
+               gstreamer-tools (>= 0.10.36),
                libavcodec-dev (>= 4:0.7),
                libpostproc-dev (>= 4:0.7),
                libavformat-dev (>= 4:0.7),
@@ -25,6 +25,7 @@ Standards-Version: 3.8.4
 
 Package: gstreamer0.10-ffmpeg
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -48,6 +49,7 @@ Description: FFmpeg plugin for GStreamer
 
 Package: gstreamer0.10-ffmpeg-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
diff --git a/debian/gstreamer0.10-ffmpeg.install b/debian/gstreamer0.10-ffmpeg.install
index f637ce9..c05229f 100644
--- a/debian/gstreamer0.10-ffmpeg.install
+++ b/debian/gstreamer0.10-ffmpeg.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*/*.so*
+debian/tmp/usr/lib/*/*/*.so*
diff --git a/debian/rules b/debian/rules
index b1c526c..20324f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ endif
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
 
 DEB_CONFIGURE_EXTRA_FLAGS += --with-system-ffmpeg \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
                              --with-package-name=$(GST_PACKAGE_NAME) \
                              --with-package-origin=$(GST_PACKAGE_ORIGIN)
 
@@ -35,8 +36,8 @@ DEB_INSTALL_DOCS_ALL += debian/README.Debian NEWS
 DEB_DH_STRIP_ARGS := --dbg-package=gstreamer0.10-ffmpeg-dbg
 
 install/gstreamer0.10-ffmpeg::
-	rm -f debian/gstreamer0.10-ffmpeg/usr/lib/gstreamer-0.10/libgst*.la
-	rm -f debian/gstreamer0.10-ffmpeg/usr/lib/gstreamer-0.10/libgst*.a
+	rm -f debian/gstreamer0.10-ffmpeg/usr/lib/*/gstreamer-0.10/libgst*.la
+	rm -f debian/gstreamer0.10-ffmpeg/usr/lib/*/gstreamer-0.10/libgst*.a
 
 common-binary-fixup-arch::
 	dh_gstscancodecs

-- 
GStreamer FFmpeg plugin 0.10 Packaging