[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.2-5-2-gd3ee0a2
Fathi Boudra
fabo at alioth.debian.org
Fri May 21 07:56:40 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit 7f5a4fc7f76fb6cee8746ba2b1d6fde24bba9e45
Author: Fathi Boudra <fabo at kde.org>
Date: Thu Feb 18 12:07:05 2010 +0100
conflict against qt-x11-free-dbg on libqt4-dbg as qvfb is in both packages.
---
debian/changelog | 2 ++
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
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list