rev 9671 - branches/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2008-03-07 13:54:33 +0000 (Fri, 07 Mar 2008)
New Revision: 9671

Modified:
   branches/qt4-x11/debian/control
   branches/qt4-x11/debian/libqtcore4.lintian
   branches/qt4-x11/debian/rules
Log:
Update libqt4-dev dependencies.
Remove QtCore dependency in qt4-dev-tools. Useless.
Update lintian since libqt4-core was renamed to libqtcore4.
Drop -debug configure option.


Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2008-03-07 11:16:28 UTC (rev 9670)
+++ branches/qt4-x11/debian/control	2008-03-07 13:54:33 UTC (rev 9671)
@@ -288,8 +288,17 @@
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libqt4-core (= ${binary:Version}), libqt4-gui (= ${binary:Version}),
- libqt4-sql (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}),
+ libqt4-gui (= ${binary:Version}), libqt4-network (= ${binary:Version}),
+ libqt4-opengl (= ${binary:Version}), libqt4-script (= ${binary:Version}),
+ libqt4-sql (= ${binary:Version}), libqt4-sql-ibase (= ${binary:Version}),
+ libqt4-sql-mysql (= ${binary:Version}), libqt4-sql-odbc (= ${binary:Version}),
+ libqt4-sql-psql (= ${binary:Version}), libqt4-sql-sqlite (= ${binary:Version}),
+ libqt4-sql-sqlite2 (= ${binary:Version}), libqt4-svg (= ${binary:Version}),
+ libqt4-webkit (= ${binary:Version}), libqt4-xml (= ${binary:Version}),
+ libqt4-xmlpatterns (= ${binary:Version}), libqt4-dbus (= ${binary:Version}),
+ libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}),
+ libqt4-help (= ${binary:Version}), libqt4-assistant (= ${binary:Version}),
+ libqt4-test (= ${binary:Version}),
  firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc],
  libaudio-dev, libcupsys2-dev, libdbus-1-dev, libfreetype6-dev,
  libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
@@ -333,7 +342,7 @@
 Package: qt4-dev-tools
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
 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, qt4-designer
 Description: Qt 4 development tools

Modified: branches/qt4-x11/debian/libqtcore4.lintian
===================================================================
--- branches/qt4-x11/debian/libqtcore4.lintian	2008-03-07 11:16:28 UTC (rev 9670)
+++ branches/qt4-x11/debian/libqtcore4.lintian	2008-03-07 13:54:33 UTC (rev 9671)
@@ -1,2 +1 @@
-libqt4-core: package-name-doesnt-match-sonames libQtCLucene4 libQtCore4
-
+libqtcore4: package-name-doesnt-match-sonames libQtCLucene4 libQtCore4

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2008-03-07 11:16:28 UTC (rev 9670)
+++ branches/qt4-x11/debian/rules	2008-03-07 13:54:33 UTC (rev 9671)
@@ -92,7 +92,6 @@
 	            -lfontconfig \
 	            -cups \
 	            -exceptions \
-	            -debug \
 	            -qdbus \
 	            -pch \
 	            -nomake examples \
@@ -145,7 +144,7 @@
 	find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
 
-install/libqt4-core::
+install/libqtcore4::
 	$(CURDIR)/bin/lrelease-qt4 debian/translations/qt_ca.ts \
 		-qm $(DEB_DESTDIR)/usr/share/qt4/translations/qt_ca.qm