[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-37-g829510c

Thu Apr 26 18:59:38 UTC 2012

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

The following commit has been merged in the experimental branch:
commit 02b020196b1c40b8b39817199cacc21426558541
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Mon Mar 19 14:14:10 2012 +0100

    Drop the libqt4-phonon package and build with -no-phonon.
    
    It's not needed anymore as QtWebKit is built from an own source package and
    no longer uses phonon anyway.
    
    Reviewed-by: Didier Raboud <odyx at debian.org>
    
        Additionally removed the debian/libqt4-phonon.* files and the phonon
        references in debian/not-installed.
---
 debian/changelog                       |    3 +++
 debian/control                         |   19 -------------------
 debian/libqt4-phonon.install           |    2 --
 debian/libqt4-phonon.lintian-overrides |    1 -
 debian/not-installed                   |    2 --
 debian/rules                           |   23 +++--------------------
 6 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 85475ac..a382764 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,9 @@ qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
     - drop elfutils build dependency.
   * Bump debhelper build-dependency to 9.
   * Fix hyphen-used-as-minus-sign lintian warnings.
+  * Drop the libqt4-phonon package and build with -no-phonon.
+    It's not needed anymore as QtWebKit is built from an own source package and
+    no longer uses phonon anyway.
 
   [ Didier Raboud ]
   * Merge the 4:4.7.4-3 unstable release: drop fix-format.diff, merged
diff --git a/debian/control b/debian/control
index add4d5f..d8580c1 100644
--- a/debian/control
+++ b/debian/control
@@ -431,25 +431,6 @@ Description: Qt 4 test module
  The QtTest module provides classes for unit testing Qt applications and
  libraries.
 
-Package: libqt4-phonon
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libphonon4
-Breaks: kdelibs5 (<= 4:4.0.80)
-Replaces: kdelibs5 (<= 4:4.0.80), libphonon4
-Description: Qt 4 Phonon module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- The Qt Phonon module provides a cross-platform multimedia framework that
- enables the use of audio and video content in Qt applications.
- .
- The sole purpose of this package to provide Phonon libraries until libphonon4
- is built from the phonon source package. Therefore it's only useful when
- bootstraping new architectures or rebuilding the whole archive from scratch.
-
 Package: libqt4-declarative
 Architecture: any
 Multi-Arch: same
diff --git a/debian/libqt4-phonon.install b/debian/libqt4-phonon.install
deleted file mode 100644
index 0f2ac5c..0000000
--- a/debian/libqt4-phonon.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libphonon.so.4*
-usr/lib/*/qt4/plugins/designer/libphononwidgets.so
diff --git a/debian/libqt4-phonon.lintian-overrides b/debian/libqt4-phonon.lintian-overrides
deleted file mode 100644
index 4a91fc8..0000000
--- a/debian/libqt4-phonon.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libqt4-phonon: package-name-doesnt-match-sonames libphonon4
diff --git a/debian/not-installed b/debian/not-installed
index c34972c..a0bc590 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -17,5 +17,3 @@
 ./usr/lib/libQtWebKit.la
 ./usr/lib/libQtXml.la
 ./usr/lib/libQtXmlPatterns.la
-./usr/lib/libphonon.la
-./usr/lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so
diff --git a/debian/rules b/debian/rules
index 3520454..bc91c6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,17 +19,14 @@ export QT_PLUGIN_PATH := $(QTDIR)/plugins
 pkgs_dbg := $(shell dh_listpackages | grep dbg | sed -e '/libqt4-dbg/d; s|-dbg||')
 # Packages whose debug symbols belong to qt4-bin-dbg
 pkgs_dbgbin := libqt4-dev-bin $(filter-out %-dbg lib% $(pkgs_dbg),$(shell dh_listpackages))
-# Library package list for override_dh_makeshlibs, excludes libqt4-phonon
-pkgs_lib := $(filter-out %-dev %-dbg libqt4-phonon libqt4-dev-bin,$(filter lib%,$(shell dh_listpackages)))
+# Library package list for override_dh_makeshlibs
+pkgs_lib := $(filter-out %-dev %-dbg libqt4-dev-bin,$(filter lib%,$(shell dh_listpackages)))
 # Upstream changelog
 upstream_changes := $(wildcard changes-*)
 # Current debian version (e.g.: 4:4.5.2-1)
 current_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 # Specific shlibs version (e.g.: 4:4.5.2)
 shlibs_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-')
-# libqt4-phonon shlibs. Minimum libphonon4 version may need adjusting for new
-# Qt upstream release
-libqt4phonon_shlibs := libphonon4 (>= 4:4.6.0) | libqt4-phonon (= $(current_version))
 # Distribution vendor
 vendor := $(shell dpkg-vendor --query Vendor)
 
@@ -141,7 +138,7 @@ endif
 	            -xmlpatterns \
 	            -no-multimedia \
 	            -audio-backend \
-	            -phonon \
+	            -no-phonon \
 	            -no-phonon-backend \
 	            -svg \
 	            -no-webkit \
@@ -306,13 +303,6 @@ endif
 	# QTBUG-12159 workaround
 	rm -f debian/tmp//usr/share/qt4/mkspecs/modules/qt_webkit_version.pri
 
-	# Remove phonon development files
-	rm -f debian/tmp/usr/lib/*/libphonon.la
-	rm -f debian/tmp/usr/lib/*/libphonon.prl
-	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
-
 	# Remove leftover directories
 	find $(CURDIR)/debian/tmp/usr/lib/qt4 -depth -type d \( -false \
 	  -o -name .moc\* \
@@ -348,13 +338,11 @@ override_dh_installchangelogs:
 override_dh_strip:
 	$(foreach pkg,$(pkgs_dbg),dh_strip -p$(pkg) --dbg-package=$(pkg)-dbg;)
 	dh_strip $(foreach pkg,$(pkgs_dbgbin),-p$(pkg)) --dbg-package=qt4-bin-dbg
-	dh_strip -plibqt4-phonon
 	dh_strip --remaining-packages --dbg-package=libqt4-dbg
 
 override_dh_makeshlibs:
 	# Specific shlibs version (e.g.: 4:4.5.2)
 	$(foreach pkg,$(pkgs_lib),dh_makeshlibs -p$(pkg) -V '$(pkg) (>= $(shlibs_version))' -- -c0;)
-	dh_makeshlibs -plibqt4-phonon -V'$(libqt4phonon_shlibs)'
 	# Generate shlibs local files
 	for pkg in $(pkgs_lib); do \
 		if test -e debian/$${pkg}/DEBIAN/shlibs ; then \
@@ -362,9 +350,4 @@ override_dh_makeshlibs:
 		fi \
 	done
 
-override_dh_shlibdeps:
-	# Exclude phonon deps from libqt4-phonon itself (they get injected there somehow)
-	dh_shlibdeps -plibqt4-phonon -- -xlibphonon4 -xlibqt4-phonon
-	dh_shlibdeps --remaining-packages
-
 .PHONY: override_dh_auto_test

-- 
Qt 4 packaging

