diff options
| author | Fathi Boudra <fabo@debian.org> | 2008-04-04 23:00:45 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2008-04-04 23:00:45 +0000 |
| commit | 98dea5bb7d625b7759f8fcdee8206d5b3969e1f0 (patch) | |
| tree | 305828c36df332eb915cba7a9e53ad009f032f6c | |
| parent | c5ec3e8ed42877c9e7462fcf4fbfa197c9c7e6bd (diff) | |
| download | qt4-x11-98dea5bb7d625b7759f8fcdee8206d5b3969e1f0.tar.gz | |
* Add patch to replace remaining qdbus by dbus.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/11_qdbus_to_dbus_fix.diff | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
4 files changed, 21 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d75e173..d8b1fb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,8 +49,9 @@ qt4-x11 (4.4.0~rc1-1) unstable; urgency=low (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@debian.org> Fri, 04 Apr 2008 10:42:06 +0200 diff --git a/debian/patches/11_qdbus_to_dbus_fix.diff b/debian/patches/11_qdbus_to_dbus_fix.diff new file mode 100644 index 0000000..626b8b5 --- /dev/null +++ b/debian/patches/11_qdbus_to_dbus_fix.diff @@ -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 diff --git a/debian/patches/series b/debian/patches/series index d528158..121aad6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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 diff --git a/debian/rules b/debian/rules index 5cc06eb..491a822 100755 --- a/debian/rules +++ b/debian/rules @@ -89,7 +89,7 @@ config.status: -lfontconfig \ -cups \ -exceptions \ - -dbus-linked \ + -dbus \ -pch \ -no-phonon \ -svg \ |