diff options
| author | Fathi Boudra <fabo@kde.org> | 2010-02-18 12:07:05 +0100 |
|---|---|---|
| committer | Fathi Boudra <fabo@kde.org> | 2010-02-18 12:07:05 +0100 |
| commit | 7f5a4fc7f76fb6cee8746ba2b1d6fde24bba9e45 (patch) | |
| tree | 0c51e6447a9cd18b45944b502c330f68b20ac0ec | |
| parent | 3575048f34cc4b984b31139c192bb3276f89c27d (diff) | |
| download | qt4-x11-7f5a4fc7f76fb6cee8746ba2b1d6fde24bba9e45.tar.gz | |
conflict against qt-x11-free-dbg on libqt4-dbg as qvfb is in both packages.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6d6a68c..bbf3482 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +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. * 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 ec143f7..5e97017 100644 --- a/debian/control +++ b/debian/control @@ -417,7 +417,7 @@ Architecture: any Section: debug Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}) -Conflicts: libqt4-debug (<< 4.4.0~beta1-1) +Conflicts: libqt4-debug (<< 4.4.0~beta1-1), qt-x11-free-dbg Replaces: libqt4-debug (<< 4.4.0~beta1-1) Description: Qt 4 library debugging symbols Qt is a cross-platform C++ application framework. Qt's primary feature |