Transition package to multi-arch and use gstreamer1.0-libav as binary package names for consistency.

5 files changed, 23 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index b51cedc..00db1f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 gst-libav1.0 (0.11.90-1) experimental; urgency=low
 
+  [ Olivier Naudan ]
   * Imported Upstream version 0.11.90
   * Imported debian/ from gstreamer0.10-ffmpeg 0.10.13-1
   * Updated debian/ for GStreamer 1.0
@@ -11,7 +12,11 @@ gst-libav1.0 (0.11.90-1) experimental; urgency=low
   * Disabled hardening flags with DEB_BUILD_MAINT_OPTIONS
     + Also updated build-dep and debian/compat accordingly
 
- -- Olivier Naudan <o-naudan@ti.com>  Tue, 24 Apr 2012 13:01:02 -0400
+  [ Sebastian Dröge ]
+  * Transition package to multi-arch.
+  * Use gstreamer1.0-libav as binary package names for consistency.
+
+ -- Sebastian Dröge <slomo@debian.org>  Thu, 03 May 2012 13:55:24 +0200
 
 gstreamer0.10-ffmpeg (0.10.13-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8b2f869..efa0b91 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,11 @@ Source: gst-libav1.0
 Section: libs
 Priority: optional
 Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintainers@lists.alioth.debian.org>
-Uploaders: David I. Lehn <dlehn@debian.org>,
-           Loic Minier <lool@dooz.org>,
+Uploaders: Loic Minier <lool@dooz.org>,
            Sebastian Dröge <slomo@debian.org>,
            Sjoerd Simons <sjoerd@debian.org>
 Build-Depends: debhelper (>= 8.9.0~),
-               cdbs (>= 0.4.8),
+               cdbs (>= 0.4.93),
                dpkg-dev (>= 1.16.1~),
                autotools-dev,
                dh-autoreconf,
@@ -26,12 +25,12 @@ Build-Depends: debhelper (>= 8.9.0~),
                yasm
 Standards-Version: 3.8.4
 
-Package: gst-libav1.0
+Package: gstreamer1.0-libav
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libavcodec53 (<< 5:0) | libavcodec-extra-53 (<< 5:0)
+         ${shlibs:Depends}
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -50,13 +49,14 @@ Description: FFmpeg plugin for GStreamer
  http://gstreamer.freedesktop.org/
  http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html
 
-Package: gst-libav1.0-dbg
+Package: gstreamer1.0-libav-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         gst-libav1.0 (= ${binary:Version})
+         gstreamer1.0-libav (= ${binary:Version})
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
diff --git a/debian/gst-libav1.0.install b/debian/gst-libav1.0.install
deleted file mode 100644
index f637ce9..0000000
--- a/debian/gst-libav1.0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/*.so*
diff --git a/debian/gstreamer1.0-libav.install b/debian/gstreamer1.0-libav.install
new file mode 100644
index 0000000..c05229f
--- /dev/null
+++ b/debian/gstreamer1.0-libav.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/*/*.so*
diff --git a/debian/rules b/debian/rules
index a891e13..f8209d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,33 +17,34 @@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 # Let's decide the package name and url depending on the distribution
 DISTRO = "$(shell dpkg-vendor --query vendor)"
 
-GST_PACKAGE_NAME := "GStreamer FFMPEG Plugins (unknown Debian derivative)"
+GST_PACKAGE_NAME := "GStreamer libav Plugins (unknown Debian derivative)"
 GST_PACKAGE_ORIGIN="http://packages.qa.debian.org/gst-libav1.0"
 
 ifeq ($(DISTRO),"Debian")
-GST_PACKAGE_NAME := "GStreamer FFMPEG Plugins (Debian)"
+GST_PACKAGE_NAME := "GStreamer libav Plugins (Debian)"
 GST_PACKAGE_ORIGIN="http://packages.qa.debian.org/gst-libav1.0"
 endif
 
 ifeq ($(DISTRO),"Ubuntu")
-GST_PACKAGE_NAME := "GStreamer FFMPEG Plugins (Ubuntu)"
+GST_PACKAGE_NAME := "GStreamer libav Plugins (Ubuntu)"
 GST_PACKAGE_ORIGIN="https://launchpad.net/distros/ubuntu/+source/gst-libav1.0"
 endif
 
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
 
-DEB_CONFIGURE_EXTRA_FLAGS += --with-system-ffmpeg \
+DEB_CONFIGURE_EXTRA_FLAGS += --with-system-libav \
+                             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
                              --with-package-name=$(GST_PACKAGE_NAME) \
                              --with-package-origin=$(GST_PACKAGE_ORIGIN)
 
 DEB_INSTALL_DOCS_ALL += debian/README.Debian NEWS
 
-DEB_DH_STRIP_ARGS := --dbg-package=gst-libav1.0-dbg
+DEB_DH_STRIP_ARGS := --dbg-package=gstreamer1.0-libav-dbg
 
 install/gst-libav1.0::
-	rm -f debian/gst-libav1.0/usr/lib/gstreamer-1.0/libgst*.la
-	rm -f debian/gst-libav1.0/usr/lib/gstreamer-1.0/libgst*.a
+	rm -f debian/gstreamer1.0-libav/usr/lib/*/gstreamer-1.0/libgst*.la
+	rm -f debian/gstreamer1.0-libav/usr/lib/*/gstreamer-1.0/libgst*.a
 
 common-binary-fixup-arch::
 	dh_gstscancodecs