[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728
Fathi Boudra
fabo at alioth.debian.org
Sat Jun 11 11:42:39 UTC 2011
The following commit has been merged in the experimental-snapshots branch:
commit 1f832b6ce7cadde4d0d04f8104a077a327b90a9f
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sat Dec 4 22:48:56 2010 +0200
Bump libqt4-dbus Replaces/Breaks against libqt4-dev to << 4:4.7.1
4:4.7.0~rc1-1/experimental still has dbus.1 manpage misplaced.
---
debian/changelog | 7 +++----
debian/control | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fe7c97e..c8880c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,12 +26,11 @@ qt4-x11 (4:4.7.1-1) UNRELEASED; urgency=low
- 04_launch_uic-qt4.diff
- 05_append_qt4_target.diff
- [ Didier Raboud ]
- * Cherry-pick "Fix qdbus manpage install. It is misplaced." from unstable.
-
[ Modestas Vainius ]
* Merge revisions from 4:4.6.3-1 to 4:4.6.3-4:
- - refresh 23_permit_plugins_built_with_future_qt.diff patch.
+ - refresh 23_permit_plugins_built_with_future_qt.diff patch;
+ - bump libqt4-dbus Replaces/Breaks against libqt4-dev to << 4:4.7.1 because
+ 4:4.7.0~rc1-1 still has dbus.1 manpage misplaced.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 06 Oct 2010 14:55:15 +0200
diff --git a/debian/control b/debian/control
index 3cd9bd4..4db2a26 100644
--- a/debian/control
+++ b/debian/control
@@ -254,8 +254,8 @@ Description: Qt 4 XML patterns module
Package: libqt4-dbus
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.6.3-2)
-Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.6.3-2)
+Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.7.1)
+Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.7.1)
Description: Qt 4 D-Bus module
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
More information about the pkg-kde-commits
mailing list