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

[Fathi Boudra]

Author: fabo
Date: 2009-06-29 16:12:27 +0000 (Mon, 29 Jun 2009)
New Revision: 15040

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
   trunk/packages/qt4-x11/debian/rules
Log:
Build Phonon from Qt sources.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-06-29 15:12:06 UTC (rev 15039)
+++ trunk/packages/qt4-x11/debian/changelog	2009-06-29 16:12:27 UTC (rev 15040)
@@ -34,6 +34,9 @@
       on dbus adaptors.
     - 0286-fix-error-string.diff
       Fix #error line not to have a ' as it's not correct.
+  * Build Phonon from Qt sources:
+    - Remove libphonon-dev build dependency.
+    - Do not remove phonon files anymore.
   * Bump Standards-Version to 3.8.2 (no changes needed).
 
   +++ Changes by Didier Raboud:

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2009-06-29 15:12:06 UTC (rev 15039)
+++ trunk/packages/qt4-x11/debian/control	2009-06-29 16:12:27 UTC (rev 15040)
@@ -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, libphonon-dev
+ x11proto-core-dev, zlib1g-dev
 Standards-Version: 3.8.2
 Homepage: http://www.qtsoftware.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-06-29 15:12:06 UTC (rev 15039)
+++ trunk/packages/qt4-x11/debian/rules	2009-06-29 16:12:27 UTC (rev 15040)
@@ -212,9 +212,6 @@
 	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