summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSune Vuorela <sune@vuorela.dk>2011-03-19 18:00:50 +0100
committerSune Vuorela <sune@vuorela.dk>2011-03-19 19:15:19 +0100
commitdbe50db1958142039bacdace74385c2897999129 (patch)
tree1d6c310d4875ddc17a9360be4e36f8e38650c66e
parentd0a770086e4252bd2e4c72e83bd31610818d3d9a (diff)
downloadqt4-x11-dbe50db1958142039bacdace74385c2897999129.tar.gz
make qt4-dev-tools conflict with qt3-dev-tools-embedded. they share qvfb
-rw-r--r--debian/changelog4
-rw-r--r--debian/control1
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@debian.org> Sat, 19 Mar 2011 13:12:51 +0100
+ -- Sune Vuorela <sune@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.