Break the circular dependency between libqt4-dbus and qdbus.

By adding libqtdbus4 with the contents of libqt4-dbus in it. Then make libqt4-dbus
depend on both qdbus and libqtdbus4. The symbols file of libqtdbus4 depends
on libqt4-dbus to ensure that a dependency on libqt4-dbus ensures qdbus is
installed, also on rebuilt packages. This arrangement is transitional.
(Closes: #669278).

(cherry picked from commit 191dfd54b5b4c00a0d2f13026060ca213b839767)

5 files changed, 29 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 9610fa9..b2e702a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ qt4-x11 (4:4.8.2+dfsg-7) UNRELEASED; urgency=low
   * Apply make_rules_for_redirect_stricter.patch taken from upstream to solve
     a "man in the middle" attack, CVE-2012-5624. Thanks Thijs Kinkhorst
     (Closes: #695156).
+  * Break the circular dependency between libqt4-dbus and qdbus by adding
+    libqtdbus4 with the contents of libqt4-dbus in it. Then make libqt4-dbus
+    depend on both qdbus and libqtdbus4. The symbols file of libqtdbus4 depends
+    on libqt4-dbus to ensure that a dependency on libqt4-dbus ensures qdbus is
+    installed, also on rebuilt packages. This arrangement is transitional.
+    (Closes: #669278).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 30 Dec 2012 00:32:00 +0100
 
diff --git a/debian/control b/debian/control
index acf7240..b10e164 100644
--- a/debian/control
+++ b/debian/control
@@ -349,7 +349,7 @@ Package: libqt4-dbus
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: qdbus (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: qdbus (= ${binary:Version}), libqtdbus4 (= ${binary:Version})
 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
@@ -362,6 +362,25 @@ Description: Qt 4 D-Bus module
  Applications using the QtDBus module can provide services to other, remote
  applications by exporting objects, as well as use services exported by those
  applications by placing calls and accessing properties.
+ .
+ This package depends on qdbus and libqtdbus4 to break their circular dependency
+ and allow easy updates from Squeeze to Wheezy.
+
+Package: libqtdbus4
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Qt 4 D-Bus module library
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtDBus module is a Unix-only library that you can use to make Inter-Process
+ Communication using the D-Bus protocol.
+ .
+ Applications using the QtDBus module can provide services to other, remote
+ applications by exporting objects, as well as use services exported by those
+ applications by placing calls and accessing properties.
 
 Package: libqt4-qt3support
 Architecture: any
diff --git a/debian/libqt4-dbus.install b/debian/libqtdbus4.install
index 3c1a8b2..3c1a8b2 100644
--- a/debian/libqt4-dbus.install
+++ b/debian/libqtdbus4.install
diff --git a/debian/libqtdbus4.lintian-overrides b/debian/libqtdbus4.lintian-overrides
new file mode 100644
index 0000000..763afe3
--- /dev/null
+++ b/debian/libqtdbus4.lintian-overrides
@@ -0,0 +1,3 @@
+libqtdbus4: package-name-doesnt-match-sonames libQtDBus4
+# We need packages to build-depend on libqt4-dbus and not libqtdbus4.
+libqtdbus4: symbols-declares-dependency-on-other-package libqt4-dbus #MINVER#
diff --git a/debian/libqt4-dbus.symbols b/debian/libqtdbus4.symbols
index 204b0b7..204b0b7 100644
--- a/debian/libqt4-dbus.symbols
+++ b/debian/libqtdbus4.symbols