[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-88-gd55b0c5

[Fathi Boudra]

The following commit has been merged in the master branch:
commit d55b0c57e85bfcc2824a6aca8892d199de6c94aa
Author: Fathi Boudra <fabo at kde.org>
Date:   Thu Feb 18 17:42:12 2010 +0100

    conflict against qt3-dev-tools-embedded on qt4-dev-tools (qvfb).
---
 debian/changelog |    4 ++--
 debian/control   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbf3482..8a75fe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,8 +43,8 @@ qt4-x11 (4:4.6.2-1~pre2) UNRELEASED; urgency=low
       (Closes: #564683)
     - extend architecture list for firebird2.1-dev.
     - build-depend on libxtst-dev to build qvfb.
-    - conflict against qt-x11-free-dbg on libqt4-dbg as qvfb is in both
-      packages.
+    - conflict against qt-x11-free-dbg on libqt4-dbg (qvfb).
+    - conflict against qt3-dev-tools-embedded on qt4-dev-tools (qvfb).
   * Update debian/qt4-dev-tools.install: add qvfb binary and the translations.
   * Update debian/rules:
     - add -qvfb configure option.
diff --git a/debian/control b/debian/control
index 5e97017..e34d793 100644
--- a/debian/control
+++ b/debian/control
@@ -481,7 +481,8 @@ Package: qt4-dev-tools
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
-Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7)
+Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7),
+ qt3-linguist (<= 3:3.3.4-7), qt3-dev-tools-embedded
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Recommends: libqt4-dev, qt4-doc, qt4-designer
 Suggests: qt4-doc-html

-- 
Qt 4 Debian packaging