rev 9672 - branches/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2008-03-07 18:03:07 +0000 (Fri, 07 Mar 2008)
New Revision: 9672

Removed:
   branches/qt4-x11/debian/libqt4-dev.lintian
   branches/qt4-x11/debian/qt4-designer.lintian
Modified:
   branches/qt4-x11/debian/control
Log:
2nd step, smooth transition to Qt4.4.0 packaging
Clean up lintian files.

TODO: update the changelog ;) I'm near the end \o/



Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2008-03-07 13:54:33 UTC (rev 9671)
+++ branches/qt4-x11/debian/control	2008-03-07 18:03:07 UTC (rev 9672)
@@ -47,6 +47,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-core (<< 4.4.0~beta1-1)
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 network module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -58,6 +60,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 OpenGL module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -72,6 +76,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-core (<< 4.4.0~beta1-1)
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 script module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -163,6 +169,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 SVG module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -187,6 +195,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqt4-core (<< 4.4.0~beta1-1)
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 XML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -208,7 +218,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Conflicts: libqt4-core (<< 4.4.0~beta1-1)
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 D-Bus module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -239,7 +250,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 designer module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -252,7 +264,6 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-core (<< 4.4.0~tp1-1)
 Description: Qt 4 help module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -264,7 +275,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
+Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 assistant module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -276,7 +288,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqt4-core (<< 4.4.0~tp1-1)
+Conflicts: libqt4-core (<< 4.4.0~beta1-1)
+Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 test module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -331,7 +344,7 @@
 Section: devel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev
 Conflicts: libqt4-designer (<< 4.4.0~beta1-1)
-Replaces: libqt4-designer (<< 4.4.0~beta1-1), qt4-dev-tools (<= 4.0.1-2)
+Replaces: qt4-dev-tools (<= 4.0.1-2), libqt4-designer (<< 4.4.0~beta1-1)
 Description: Qt 4 Designer
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.

Deleted: branches/qt4-x11/debian/libqt4-dev.lintian

Deleted: branches/qt4-x11/debian/qt4-designer.lintian