[SCM] Qt 4 packaging branch, master, updated. debian/4.8.4+dfsg-4-34-g59fec40

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=a0bc904

The following commit has been merged in the master branch:
commit a0bc904bea61ac85c65ba5c56bbf2aeece296f0d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jul 2 17:23:45 2013 -0300

    Remove the gstreamer backend.
    
    We build it from another source package.
---
 debian/changelog |    2 ++
 debian/rules     |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4eb038d..a439332 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ qt4-x11 (4:4.8.5+dfsg-1) UNRELEASED; urgency=low
   * Update symbols files.
   * Pass --fail-missing to dh_install.
   * Remove libtool-like files.
+  * Remove the gstreamer phonon backend, we are building it in another source
+    package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Jun 2013 11:08:53 -0300
 
diff --git a/debian/rules b/debian/rules
index f31be17..0b67a02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -321,6 +321,8 @@ override_dh_auto_install:
 	rm -f debian/tmp/usr/lib/*/libphonon.so
 	rm -f debian/tmp/usr/lib/*/pkgconfig/phonon.pc
 	rm -rf debian/tmp/usr/include/qt4/phonon
+	# And the gstreamer backend.
+	rm -f usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins/phonon_backend/libphonon_gstreamer.so
 
 	# Add a configuration for qtchooser
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser

-- 
Qt 4 packaging