[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit dbe50db1958142039bacdace74385c2897999129
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sat Mar 19 18:00:50 2011 +0100

    make qt4-dev-tools conflict with qt3-dev-tools-embedded. they share qvfb
---
 debian/changelog |    4 +++-
 debian/control   |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e81b6b4..2fd3164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ qt4-x11 (4:4.7.2-2) unstable; urgency=low
 
   [ Sune Vuorela ]
   * Use gcc4.5 on s390 (Closes: #606079)
+  * Make qt4-dev-tools conflict with qt3-dev-tools-embedded (due to
+    qvfb). Closes: 617579
 
- -- Sune Vuorela <sune at debian.org>  Sat, 19 Mar 2011 13:12:51 +0100
+ -- Sune Vuorela <sune at debian.org>  Sat, 19 Mar 2011 18:00:06 +0100
 
 qt4-x11 (4:4.7.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d34a2ee..3373cac 100644
--- a/debian/control
+++ b/debian/control
@@ -511,6 +511,7 @@ Breaks: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Recommends: libqt4-dev, qt4-doc, qt4-designer
 Suggests: qt4-doc-html
+Conflicts: qt3-dev-tools-embedded
 Description: Qt 4 development tools
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

-- 
Qt 4 packaging