[SCM] Phonon GStreamer backend packaging branch, master, updated. debian/4.6.0.0-1-1-g9bea7c9

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git;a=commitdiff;h=9bea7c9

The following commit has been merged in the master branch:
commit 9bea7c9b0d418e61a26a52f0fa6d677f6846e747
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Wed Mar 7 20:26:52 2012 +0100

    Convert for multiarch.
---
 debian/changelog                        |    7 +++++++
 debian/control                          |    9 ++++++---
 debian/phonon-backend-gstreamer.install |    2 +-
 debian/rules                            |    4 +++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d68e2f5..847b44c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+phonon-backend-gstreamer (4:4.6.0.0-1+exp1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Convert for multiarch.
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Wed, 07 Mar 2012 20:05:58 +0100
+
 phonon-backend-gstreamer (4:4.6.0.0-1) unstable; urgency=low
 
   * New upstream release (4.6.0):
diff --git a/debian/control b/debian/control
index 738ea3a..39fd7b3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: sound
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Modestas Vainius <modax at debian.org>
-Build-Depends: debhelper (>= 7.4.13), cmake (>= 2.6.2), pkg-kde-tools (>= 0.12),
+Build-Depends: debhelper (>= 8.1.3~), cmake (>= 2.6.2), pkg-kde-tools (>= 0.12),
  automoc, libphonon-dev (>= 4:4.6.0.0), libphononexperimental-dev (>= 4:4.6.0.0),
  libasound2-dev [linux-any], libglib2.0-dev, libgstreamer0.10-dev,
- libgstreamer-plugins-base0.10-dev, libxml2-dev, libqt4-dev (>= 4.5),
- libgl1-mesa-dev, libqt4-opengl-dev (>= 4.5)
+ libgstreamer-plugins-base0.10-dev, libxml2-dev, libqt4-dev (>= 4:4.8.0),
+ libgl1-mesa-dev, libqt4-opengl-dev (>= 4:4.8.0)
 Standards-Version: 3.9.2
 Homepage: http://phonon.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git
@@ -15,7 +15,9 @@ Vcs-Git: git://git.debian.org/pkg-kde/kde-std/phonon-backend-gstreamer.git
 
 Package: phonon-backend-gstreamer
 Architecture: any
+Multi-Arch: same
 Provides: phonon-backend
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  gstreamer0.10-plugins-base, gstreamer0.10-alsa [linux-any]
 Recommends: gstreamer0.10-plugins-good
@@ -34,6 +36,7 @@ Package: phonon-backend-gstreamer-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, phonon-backend-gstreamer (= ${binary:Version})
 Replaces: phonon-dbg (<< 4:4.6.0really4.4.4)
 Breaks: phonon-dbg (<< 4:4.6.0really4.4.4)
diff --git a/debian/phonon-backend-gstreamer.install b/debian/phonon-backend-gstreamer.install
index 3679b2d..9b1c258 100644
--- a/debian/phonon-backend-gstreamer.install
+++ b/debian/phonon-backend-gstreamer.install
@@ -1,3 +1,3 @@
-usr/lib/qt4/plugins/phonon_backend/phonon_gstreamer.so
+usr/lib/*/qt4/plugins/phonon_backend/phonon_gstreamer.so
 usr/share/icons/hicolor/*/apps/phonon-gstreamer.*
 usr/share/kde4/services/phononbackends/gstreamer.desktop
diff --git a/debian/rules b/debian/rules
index 012677f..4cb0576 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,11 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DPLUGIN_INSTALL_DIR=/usr/lib/qt4/
+	$(overridden_command) -- -DPLUGIN_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/
 
 override_dh_shlibdeps:
 	$(overridden_command) -- -xphonon

-- 
Phonon GStreamer backend packaging