Break qdbus out into a separate 'qdbus' package and make it a dependency of

libqt4-dbus, because some things will use this at runtime. It makes
libqt4-dbus genuinely multiarch-installable.

5 files changed, 18 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 8bf3321..c7d97e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ qt4-x11 (4:4.7.4-1) UNRELEASED; urgency=low
     - 21_qt_ia32_library_path.diff - interacts incompatibly with the multiarch
       path resolution and should be obsolete anyway now that multiarch is
       available: we should drop qt from the next ia32-libs upload.
+  * Break qdbus out into a separate 'qdbus' package and make it a dependency of
+    libqt4-dbus, because some things will use this at runtime. It makes
+    libqt4-dbus genuinely multiarch-installable.
 
  -- Fathi Boudra <fabo@debian.org>  Mon, 12 Sep 2011 08:52:33 +0300
 
diff --git a/debian/control b/debian/control
index 6de7710..f1b819b 100644
--- a/debian/control
+++ b/debian/control
@@ -301,7 +301,7 @@ Description: Qt 4 XML patterns module
 
 Package: libqt4-dbus
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, qdbus
 Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.7.1)
 Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.7.1)
 Description: Qt 4 D-Bus module
@@ -725,6 +725,19 @@ Description: Qt 4 Linguist tools
  Qt Designer interface files, and produces or updates .ts translation files.
  lrelease is a command line tool that produces QM files out of TS files.
 
+Package: qdbus
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libqt4-dbus (<< 4:4.7.4-1)
+Replaces: libqt4-dbus (<< 4:4.7.4-1)
+Description: Qt 4 D-Bus tool
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains qdbus, a command-line tool interface to D-Bus that uses
+ the QtDBus library.
+
 Package: qt4-doc
 Architecture: all
 Section: doc
diff --git a/debian/libqt4-dbus.install b/debian/libqt4-dbus.install
index 617bc5c..4e6f1b4 100644
--- a/debian/libqt4-dbus.install
+++ b/debian/libqt4-dbus.install
@@ -1,2 +1 @@
-usr/bin/qdbus
 usr/lib/libQtDBus.so.*
diff --git a/debian/qdbus.install b/debian/qdbus.install
new file mode 100644
index 0000000..3439206
--- /dev/null
+++ b/debian/qdbus.install
@@ -0,0 +1 @@
+usr/bin/qdbus
diff --git a/debian/libqt4-dbus.manpages b/debian/qdbus.manpages
index f3ef030..f3ef030 100644
--- a/debian/libqt4-dbus.manpages
+++ b/debian/qdbus.manpages