rev 15106 - trunk/packages/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2009-07-04 15:31:16 +0000 (Sat, 04 Jul 2009)
New Revision: 15106

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/rules
Log:
Merge from KDE Phonon packages:
- Add pkg-kde-tools build dependency to get pkgkde-symbolshelper
- Add epoch to libphonon4 package only
- Remove the generated symbols file on clean
- Call pkgkde-symbolshelper to generate the symbols file


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-07-04 14:56:27 UTC (rev 15105)
+++ trunk/packages/qt4-x11/debian/changelog	2009-07-04 15:31:16 UTC (rev 15106)
@@ -1,4 +1,4 @@
-qt4-x11 (4:4.5.2-1) UNRELEASED; urgency=low
+qt4-x11 (4.5.2-1) UNRELEASED; urgency=low
 
   * New upstream release:
     - QtWebKit
@@ -35,9 +35,11 @@
     - 0286-fix-error-string.diff
       Fix #error line not to have a ' as it's not correct.
   * Build Phonon from Qt sources:
-    - Add epoch and set it to 4 (to upgrade phonon provided previously by KDE).
+    - Add epoch to Phonon packages and set it to 4
+      (to upgrade phonon provided previously by KDE).
     - Remove libphonon-dev build dependency.
     - Do not remove phonon files anymore.
+    - Keep libphonon4 symbols file and add pkg-kde-tools build dependency.
   * Bump Standards-Version to 3.8.2 (no changes needed).
   * Update installed files.
 

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2009-07-04 14:56:27 UTC (rev 15105)
+++ trunk/packages/qt4-x11/debian/control	2009-07-04 15:31:16 UTC (rev 15106)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Brian Nelson <pyro at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs, debhelper (>= 5), quilt, flex, sharutils,
+Build-Depends: cdbs, debhelper (>= 5), quilt, pkg-kde-tools (>= 0.4), flex, sharutils,
  firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 amd64 sparc powerpc],
  libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
  libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2009-07-04 14:56:27 UTC (rev 15105)
+++ trunk/packages/qt4-x11/debian/rules	2009-07-04 15:31:16 UTC (rev 15106)
@@ -25,6 +25,9 @@
 
 DEB_MAKE_CLEAN_TARGET := confclean distclean
 
+# Add epoch to Phonon packages only
+DEB_DH_GENCONTROL_ARGS_libphonon4 := -- -v4:$(CURRENTVERSION)
+
 # Shlibs of the current upstream version
 #DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 # Specific shlibs version
@@ -36,8 +39,7 @@
 DEB_DH_STRIP_ARGS_libqt4-xmlpatterns-dbg := --exclude=.debug
 DEB_DH_STRIP_ARGS_phonon-dbg := --exclude=.debug
 
-DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
-#DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xphonon
+DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xphonon --exclude=.debug
 
 # Disable for rc
 DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
@@ -205,6 +207,7 @@
 	| cut -d ':' -f 1 | xargs rm -f
 
 	# Generated on build
+	rm -f debian/libphonon4.symbols
 	rm -f debian/shlibs.local
 	rm -f debian/stamp-makefile-build-tools
 
@@ -279,6 +282,7 @@
 
 # Generate shlibs local files
 $(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
+	pkgkde-symbolshelper symbolfile -p libphonon4 -o debian/libphonon4.symbols
 	if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \
 		sed 's/>=[^)]*/= $(CURRENTVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs >> debian/shlibs.local ;\
 	fi