[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-beta2-1-4-gf154e28

[Modestas Vainius]

The following commit has been merged in the experimental-snapshots branch:
commit f03c70490320922f078002ecd9e47ae04bfa9425
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Jul 13 21:49:55 2010 +0300

    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.
---
 debian/changelog |    7 +++++++
 debian/control   |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86453be..68af938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.7.0~beta2-3) UNRELEASED; urgency=low
+
+  * 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.
+
+ -- 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:
diff --git a/debian/control b/debian/control
index a0d7643..acc9085 100644
--- a/debian/control
+++ b/debian/control
@@ -376,8 +376,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 (<< 4.4.0~rc1-4)
-Replaces: libqtwebkit-dev (<< 4.4.0~rc1-4), libqt4-opengl-dev (<< 4.4.0-2)
+Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev (<< 2.0~)
+Replaces: libqtwebkit-dev (<< 2.0~), 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 packaging