rev 13360 - branches/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2009-01-15 11:21:31 +0000 (Thu, 15 Jan 2009)
New Revision: 13360

Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/control
Log:
Move mkspecs in qt4-qmake package to use qt4-qmake standalone.


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2009-01-15 10:56:58 UTC (rev 13359)
+++ branches/qt4-x11/debian/changelog	2009-01-15 11:21:31 UTC (rev 13360)
@@ -7,7 +7,7 @@
   * Clean up the prl postprocessing.
   * Build documentations if current version is a snapshot.
   * Update *.install and *.lintian files.
-  * Split mkspecs in qt4-mskpecs package to use qt4-qmake standalone.
+  * Move mkspecs in qt4-qmake package to use qt4-qmake standalone.
   * Add symbols files support for amd64 and i386 architectures.
   * Add Debian patches:
     - 18_enable_qt3support_qtwebkit_debug_info.diff

Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2009-01-15 10:56:58 UTC (rev 13359)
+++ branches/qt4-x11/debian/control	2009-01-15 11:21:31 UTC (rev 13360)
@@ -438,8 +438,8 @@
 Package: qt4-qmake
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, qt4-mkspecs
-Replaces: libqt4-dev (<< 4.4.2-1)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
 Description: Qt 4 qmake Makefile generator tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -449,6 +449,11 @@
  qmake automates the generation of Makefiles so that only a few lines of
  information are needed to create each Makefile. qmake can be used for any
  software project, whether it is written using Qt or not.
+ .
+ Qt 4 qmake requires a platform and compiler description file which contains
+ many default values used to generate appropriate Makefiles.
+ .
+ This package contains also these platform specifications.
 
 Package: qt4-qtconfig
 Architecture: any
@@ -503,18 +508,4 @@
  The documentation is provided in HTML format; the HTML version can be viewed
  in conjunction with the legacy Qt Assistant (assistant_adp) found in the
  qt4-dev-tools package.
-
-Package: qt4-mkspecs
-Architecture: all
-Section: devel
-Depends: ${misc:Depends}
-Suggests: qt4-qmake
-Replaces: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
-Description: Qt 4 Makefiles specifications for qmake
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- Qt 4 qmake requires a platform and compiler description file which contains
- many default values used to generate appropriate Makefiles.
- .
- This package contains these platform specifications.
+ 
\ No newline at end of file