rev 9988 - in branches/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-04-04 23:00:45 +0000 (Fri, 04 Apr 2008)
New Revision: 9988

Added:
   branches/qt4-x11/debian/patches/11_qdbus_to_dbus_fix.diff
Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/patches/series
   branches/qt4-x11/debian/rules
Log:
* Add patch to replace remaining qdbus by dbus.


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2008-04-04 22:58:04 UTC (rev 9987)
+++ branches/qt4-x11/debian/changelog	2008-04-04 23:00:45 UTC (rev 9988)
@@ -49,8 +49,9 @@
     (Closes: #473348)
   * Add patch to fix unaligned access that cause a bus error on hppa.
     Thanks to Bernhard R. Link. (Closes: #458133)
+  * Add patch to replace remaining qdbus by dbus.
   * Update configure options:
-    * Replace -qdbus by -dbus-linked.
+    * Replace -qdbus by -dbus.
     * Add -svg.
 
  -- Fathi Boudra <fabo at debian.org>  Fri, 04 Apr 2008 10:42:06 +0200

Added: branches/qt4-x11/debian/patches/11_qdbus_to_dbus_fix.diff
===================================================================
--- branches/qt4-x11/debian/patches/11_qdbus_to_dbus_fix.diff	                        (rev 0)
+++ branches/qt4-x11/debian/patches/11_qdbus_to_dbus_fix.diff	2008-04-04 23:00:45 UTC (rev 9988)
@@ -0,0 +1,17 @@
+--- a/src/phonon/phonon.pro
++++ b/src/phonon/phonon.pro
+@@ -104,7 +104,7 @@
+            $$PHONON_DIR/volumefadereffect.cpp \
+            $$PHONON_DIR/volumeslider.cpp
+ 
+-contains(QT_CONFIG, qdbus) {
++contains(QT_CONFIG, dbus) {
+        CONFIG += qdbus
+        HEADERS += $$PHONON_DIR/audiooutputadaptor.h
+        SOURCES += $$PHONON_DIR/audiooutputadaptor.cpp
+--- a/src/plugins/script/script.pro
++++ b/src/plugins/script/script.pro
+@@ -1,2 +1,2 @@
+ TEMPLATE = subdirs
+-contains(QT_CONFIG, qdbus):SUBDIRS += qtdbus
++contains(QT_CONFIG, dbus):SUBDIRS += qtdbus

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2008-04-04 22:58:04 UTC (rev 9987)
+++ branches/qt4-x11/debian/patches/series	2008-04-04 23:00:45 UTC (rev 9988)
@@ -20,6 +20,7 @@
 07_trust_dpkg-arch_over_uname-m.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
+11_qdbus_to_dbus_fix.diff
 20_mips_atomic_ops.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2008-04-04 22:58:04 UTC (rev 9987)
+++ branches/qt4-x11/debian/rules	2008-04-04 23:00:45 UTC (rev 9988)
@@ -89,7 +89,7 @@
 	            -lfontconfig \
 	            -cups \
 	            -exceptions \
-	            -dbus-linked \
+	            -dbus \
 	            -pch \
 	            -no-phonon \
 	            -svg \