[Pkg-kde-commits] rev 1618 - trunk/packages/qt4-x11/debian

[Brian Nelson]

Author: pyro
Date: 2005-08-31 04:02:15 +0000 (Wed, 31 Aug 2005)
New Revision: 1618

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
Log:
  
  * Increased the conflicting Qt3 package versions to <= 3.3.4-7, since
    the Qt3 packages still don't use the alternatives system as needed to
    coexist with Qt4.

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2005-08-30 23:52:52 UTC (rev 1617)
+++ trunk/packages/qt4-x11/debian/changelog	2005-08-31 04:02:15 UTC (rev 1618)
@@ -4,8 +4,12 @@
     qmake.conf so that qmake generates Makefiles that use the -qt4 tools.
     This way, it can cope with systems that have alternatives set to use
     the -qt3 versions.
+  
+  * Increased the conflicting Qt3 package versions to <= 3.3.4-7, since
+    the Qt3 packages still don't use the alternatives system as needed to
+    coexist with Qt4.
 
- -- Brian Nelson <pyro at debian.org>  Tue, 30 Aug 2005 15:22:22 -0700
+ -- Brian Nelson <pyro at debian.org>  Tue, 30 Aug 2005 21:01:46 -0700
 
 qt4-x11 (4.0.1-1) unstable; urgency=low
 

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2005-08-30 23:52:52 UTC (rev 1617)
+++ trunk/packages/qt4-x11/debian/control	2005-08-31 04:02:15 UTC (rev 1618)
@@ -10,7 +10,7 @@
 Architecture: any
 Section: libdevel
 Depends: libqt4-core (= ${Source-Version}), xlibs-dev (>= 4.2.1), libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libc6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, libaudio-dev, xlibs-static-pic, libxinerama-dev
-Conflicts: qt3-dev-tools (<= 3:3.3.4-3)
+Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
 Recommends: libqt4-gui (= ${Source-Version}), qt4-dev-tools
 Suggests: libqt4-sql (= ${Source-Version}), libqt4-qt3support (= ${Source-Version}), qt4-doc, libqt4-debug
 Description: Qt 4 development files
@@ -39,7 +39,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}, fontconfig
-Conflicts: qt3-qtconfig (<= 3:3.3.4-3)
+Conflicts: qt3-qtconfig (<= 3:3.3.4-7)
 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.
@@ -107,7 +107,7 @@
 Architecture: any
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: qt3-assistant (<= 3:3.3.4-3), qt3-designer (<= 3:3.3.4-3), qt3-linguist (<= 3:3.3.4-3)
+Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7)
 Recommends: libqt4-dev, qt4-doc
 Description: Qt 4 development tools
  Qt is a cross-platform C++ application framework.  Qt's primary feature