diff options
| author | Fathi Boudra <fabo@debian.org> | 2010-07-14 09:00:39 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2010-07-14 09:00:39 +0300 |
| commit | 2eaf72180b6e30c35b3ddbf0408e6c66da96a040 (patch) | |
| tree | 2eb63476da0608d835385df0881667e9cdfb9538 | |
| parent | 8e8d35a2f1f9862265a00edf8d4414b4ebe3fce0 (diff) | |
| download | qt4-x11-2eaf72180b6e30c35b3ddbf0408e6c66da96a040.tar.gz | |
Merge -3 changes with -2.
| -rw-r--r-- | 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@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@debian.org> Tue, 13 Jul 2010 16:20:28 +0300 + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 13 Jul 2010 16:20:28 +0300 qt4-x11 (4:4.7.0~beta2-1) experimental; urgency=low |