[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-beta2-1-7-gf159949
Fathi Boudra
fabo at alioth.debian.org
Wed Jul 14 06:07:12 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit 2eaf72180b6e30c35b3ddbf0408e6c66da96a040
Author: Fathi Boudra <fabo at debian.org>
Date: Wed Jul 14 09:00:39 2010 +0300
Merge -3 changes with -2.
---
debian/changelog | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b67fe05..f3a10c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,17 @@
-qt4-x11 (4:4.7.0~beta2-3) UNRELEASED; urgency=low
+qt4-x11 (4:4.7.0~beta2-2) experimental; urgency=low
+
+ [ Fathi Boudra ]
+ * Add 0001_qt_webkit_version.pri_conflict.diff:
+ Fix qt_webkit_version.pri conflict, installed inconditionaly.
+ [ Modestas Vainius ]
* Make libqt4-dev conflict with libqtwebkit-dev less broad: (<< 2.0~). The
latest version which this conflict is supposed to cover is 0~svn29752-1.
* Add Breaks (or turn Conflicts into Breaks) next to Replaces as recommended
by policy 3.9.0.
* Remove conflicts against old (predating etch) qt-x11-free (Qt3) packages.
- -- Modestas Vainius <modax at debian.org> Tue, 13 Jul 2010 21:45:54 +0300
-
-qt4-x11 (4:4.7.0~beta2-2) experimental; urgency=low
-
- * Add 0001_qt_webkit_version.pri_conflict.diff:
- Fix qt_webkit_version.pri conflict, installed inconditionaly.
-
- -- Fathi Boudra <fabo at debian.org> Tue, 13 Jul 2010 16:20:28 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 13 Jul 2010 16:20:28 +0300
qt4-x11 (4:4.7.0~beta2-1) experimental; urgency=low
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list