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

[Modestas Vainius]

Author: modax-guest
Date: 2008-05-09 20:38:15 +0000 (Fri, 09 May 2008)
New Revision: 10520

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/control
Log:
Add missing replaces for libqt4-opengl-dev and libqt4-dev

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-05-09 20:34:10 UTC (rev 10519)
+++ trunk/packages/qt4-x11/debian/changelog	2008-05-09 20:38:15 UTC (rev 10520)
@@ -1,4 +1,4 @@
-qt4-x11 (4.4.0-2) UNRELEASED; urgency=low
+qt4-x11 (4.4.0-2) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:
 
@@ -15,8 +15,13 @@
   * Add 16_qsortfilterproxymodel_invalidate_noscroll.diff patch which stops
     scrolling to the current item/index on QSortFilterProxyModel::invalidate()
     This patch has been scheduled for Qt 4.4.1 (TT #204403).
+  * Add missing Replaces:
+    - libqt4-opengl-dev replaces libqt4-dev (<< 4.4.0-2) due to obvious
+      reasons.
+    - libqt4-dev replaces libqt4-opengl-dev (<< 4.4.0-2) (due to qglobal.h
+      misplace).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 May 2008 23:23:55 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 May 2008 23:35:16 +0300
 
 qt4-x11 (4.4.0-1) unstable; urgency=low
 

Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control	2008-05-09 20:34:10 UTC (rev 10519)
+++ trunk/packages/qt4-x11/debian/control	2008-05-09 20:38:15 UTC (rev 10520)
@@ -334,7 +334,7 @@
  libqt4-assistant (= ${binary:Version}), libqt4-test (= ${binary:Version})
 Recommends: libqt4-opengl-dev (= ${binary:Version})
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev
-Replaces: libqtwebkit-dev
+Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2)
 Suggests: qt4-dev-tools, qt4-doc, libmysqlclient15-dev, libsqlite0-dev, libsqlite3-dev, libpq-dev, libiodbc2-dev, firebird2.0-dev
 Description: Qt 4 development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -349,6 +349,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libqt4-opengl (= ${binary:Version}), libqt4-dev (= ${binary:Version}),
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev
+Replaces: libqt4-dev (<< 4.4.0-2)
 Description: Qt 4 OpenGL library development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.