[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.7.0-beta1-1-12-g8f2fdcb

Fathi Boudra fabo at alioth.debian.org
Thu Jun 10 14:28:29 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit 8f2fdcbf34d47caa670b51b3285550caf0c7d553
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Jun 10 17:25:16 2010 +0300

    Add versioned conflicts/replaces against libqtwebkit-dev.
---
 debian/control |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 8ba2cc2..10b6ec8 100644
--- a/debian/control
+++ b/debian/control
@@ -356,8 +356,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
  libqt4-help (= ${binary:Version}), libqt4-test (= ${binary:Version}),
  libqt4-declarative (= ${binary:Version}), qt4-qmake (= ${binary:Version})
 Recommends: libqt4-opengl-dev (= ${binary:Version})
-Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev
-Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2)
+Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev (<< 4.4.0~rc1-4)
+Replaces: libqtwebkit-dev (<< 4.4.0~rc1-4), libqt4-opengl-dev (<< 4.4.0-2)
 Suggests: qt4-dev-tools, qt4-doc, libmysqlclient-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, unixodbc-dev, firebird2.1-dev
 Description: Qt 4 development files
  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