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

[Brian Nelson]

Author: pyro
Date: 2006-07-29 01:36:26 +0000 (Sat, 29 Jul 2006)
New Revision: 4217

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
Log:
  * debian/control: made libqt4-gui conflict/replace libqt4-designer, to
    ensure that old package is removed (Closes: #380253)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-07-28 20:58:22 UTC (rev 4216)
+++ trunk/packages/qt4-x11/debian/changelog	2006-07-29 01:36:26 UTC (rev 4217)
@@ -1,3 +1,10 @@
+qt4-x11 (4.1.4-2) UNRELEASED; urgency=low
+
+  * debian/control: made libqt4-gui conflict/replace libqt4-designer, to
+    ensure that old package is removed (Closes: #380253)
+
+ -- Brian Nelson <pyro at debian.org>  Fri, 28 Jul 2006 18:35:48 -0700
+
 qt4-x11 (4.1.4-1) unstable; urgency=low
 
   * New upstream release (Closes: #378443)

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2006-07-28 20:58:22 UTC (rev 4216)
+++ trunk/packages/qt4-x11/debian/control	2006-07-29 01:36:26 UTC (rev 4217)
@@ -54,7 +54,8 @@
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}, fontconfig
 Recommends: qt4-qtconfig
-Replaces: libqt4-core (<< 4.0.1-3), qt4-designer (<< 4.1.4)
+Replaces: libqt4-core (<< 4.0.1-3), qt4-designer (<< 4.1.4), libqt4-designer
+Conflicts: libqt4-designer
 Description: Qt 4 core GUI functionality runtime library
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.