rev 10128 - trunk/packages/qt4-x11/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2008-04-12 16:16:06 +0000 (Sat, 12 Apr 2008)
New Revision: 10128

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
Log:
add conflicts/replaces for qtwebkit-dev

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-04-12 15:12:21 UTC (rev 10127)
+++ trunk/packages/qt4-x11/debian/changelog	2008-04-12 16:16:06 UTC (rev 10128)
@@ -1,3 +1,9 @@
+qt4-x11 (4.4.0~rc1-4) unstable; urgency=low
+
+  * Have libqt4-dev conflict/replace libqtwebkit-dev.
+
+ -- Sune Vuorela <debian at pusling.com>  Sat, 12 Apr 2008 18:14:01 +0200
+
 qt4-x11 (4.4.0~rc1-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2008-04-12 15:12:21 UTC (rev 10127)
+++ trunk/packages/qt4-x11/debian/control	2008-04-12 16:16:06 UTC (rev 10128)
@@ -317,7 +317,8 @@
  libqt4-help (= ${binary:Version}),
  libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version}),
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
-Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
+Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev
+Replaces: libqtwebkit-dev
 Suggests: qt4-dev-tools, qt4-doc
 Description: Qt 4 development files
  Qt is a cross-platform C++ application framework. Qt's primary feature