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

[Fathi Boudra]

Author: fabo
Date: 2009-02-20 21:17:55 +0000 (Fri, 20 Feb 2009)
New Revision: 13855

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/rules
Log:
Fix shlibs version.
Build with -phonon and -no-phonon-backend configure options.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-02-20 20:31:29 UTC (rev 13854)
+++ trunk/packages/qt4-x11/debian/changelog	2009-02-20 21:17:55 UTC (rev 13855)
@@ -1,3 +1,16 @@
+qt4-x11 (4.5.0~rc1-2) UNRELEASED; urgency=low
+
+  UNRELEASED
+
+  * Fix shlibs version. It should be 4.5.0~rc1.
+  * Update debian/rules:
+    - Build with -phonon and -no-phonon-backend configure options.
+    - Remove built phonon and use system phonon.
+  * Update debian/control:
+    - Add libphonon-dev build dependency.
+
+ -- Fathi Boudra <fabo at debian.org>  Fri, 20 Feb 2009 21:32:16 +0100
+
 qt4-x11 (4.5.0~rc1-1) experimental; urgency=low
 
   * New upstream release:

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2009-02-20 20:31:29 UTC (rev 13854)
+++ trunk/packages/qt4-x11/debian/control	2009-02-20 21:17:55 UTC (rev 13855)
@@ -12,7 +12,7 @@
  libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev,
  libxcursor-dev, libxext-dev, libxft-dev, libxi-dev, libxinerama-dev,
  libxmu-dev, libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev,
- x11proto-core-dev, zlib1g-dev
+ x11proto-core-dev, zlib1g-dev, libphonon-dev
 Standards-Version: 3.8.0
 Homepage: http://www.trolltech.com
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/qt4-x11

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2009-02-20 20:31:29 UTC (rev 13854)
+++ trunk/packages/qt4-x11/debian/rules	2009-02-20 21:17:55 UTC (rev 13855)
@@ -28,7 +28,7 @@
 # Shlibs of the current upstream version
 #DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 # Specific shlibs version
-SHLIBSVERSION := 4.5.0
+SHLIBSVERSION := 4.5.0~rc1
 $(foreach libpkg,$(filter-out %-dev %-dbg,$(filter lib%,$(DEB_ARCH_PACKAGES))),$(eval DEB_DH_MAKESHLIBS_ARGS_$(libpkg) := -V'$(libpkg) (>= $(SHLIBSVERSION))'))
 
 DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug
@@ -128,7 +128,8 @@
 	            -exceptions \
 	            -dbus \
 	            -pch \
-	            -no-phonon \
+	            -phonon \
+	            -no-phonon-backend \
 	            -svg \
 	            -webkit \
 	            -xmlpatterns \
@@ -210,6 +211,9 @@
 	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;
 
+	# Use system phonon
+	rm -f lib/*phonon* debian/tmp/usr/lib/*phonon*
+
 install/libqtcore4::
 	$(CURDIR)/bin/lrelease-qt4 debian/translations/qt_ca.ts \
 		-qm $(DEB_DESTDIR)/usr/share/qt4/translations/qt_ca.qm