rev 8522 - branches/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2007-12-24 21:27:40 +0000 (Mon, 24 Dec 2007)
New Revision: 8522

Modified:
   branches/qt4-x11/debian/TODO
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/libqt4-gui.install
   branches/qt4-x11/debian/qt4-dev-tools.install
Log:
* Update libqt4-gui.install and qt4-dev-tool.install files.
* Update TODO file according to the changes.


Modified: branches/qt4-x11/debian/TODO
===================================================================
--- branches/qt4-x11/debian/TODO	2007-12-24 21:23:27 UTC (rev 8521)
+++ branches/qt4-x11/debian/TODO	2007-12-24 21:27:40 UTC (rev 8522)
@@ -2,13 +2,14 @@
 * Fix dpkg-shlibdeps failure: couldn't find library libQtWebKit.so.4
    debian/qt4-designer/usr/lib/qt4/plugins/designer/libqaxwidget.so (its RPATH is '').
 * Find a way to enable exceptions only for XmlPatterns
+  From Thiago:
+  That would require some modification to the buildsystem, which hasn't
+  happened so far. I don't think we have thought of that idea yet.
+  Anyways, a simple workaround for your case is to build Qt without exceptions,
+  then reconfigure with them and build QtXmlPatterns only. Unless the ABI for
+  with/without exceptions changes for your compiler, of course.
 * Install new files :
 
-usr/bin/assistant_new
-usr/bin/qcollectiongenerator
-usr/bin/qhelpconverter
-usr/bin/qhelpgenerator
-
 usr/lib/libQtCLucene.so.4
 usr/lib/libQtCLucene.so.4.4
 usr/lib/libQtCLucene.so.4.4.0
@@ -28,5 +29,3 @@
 usr/lib/libphonon.so.5
 usr/lib/libphonon.so.5.0
 usr/lib/libphonon.so.5.0.0
-
-usr/lib/qt4/plugins/script/libqtscriptdbus.so

Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2007-12-24 21:23:27 UTC (rev 8521)
+++ branches/qt4-x11/debian/changelog	2007-12-24 21:27:40 UTC (rev 8522)
@@ -24,6 +24,7 @@
     * Enable exceptions. It is a dependency to XmlPatterns module.
   * Refresh patches: 01, 02, 03, 04, 05.
   * Disable all other patches.
+  * Update libqt4-gui.install and qt4-dev-tool.install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Dec 2007 11:20:46 +0100
 

Modified: branches/qt4-x11/debian/libqt4-gui.install
===================================================================
--- branches/qt4-x11/debian/libqt4-gui.install	2007-12-24 21:23:27 UTC (rev 8521)
+++ branches/qt4-x11/debian/libqt4-gui.install	2007-12-24 21:27:40 UTC (rev 8522)
@@ -4,8 +4,9 @@
 usr/lib/libQtDesigner.so.*
 usr/lib/libQtDesignerComponents.so.*
 usr/lib/libQtAssistantClient.so.*
-usr/lib/qt4/plugins/imageformats/*.so
-usr/lib/qt4/plugins/iconengines/*.so
-usr/lib/qt4/plugins/inputmethods/*.so
 usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
 usr/lib/qt4/plugins/codecs/*.so
+usr/lib/qt4/plugins/iconengines/libqsvg.so
+usr/lib/qt4/plugins/imageformats/*.so
+usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so
+usr/lib/qt4/plugins/script/libqtscriptdbus.so

Modified: branches/qt4-x11/debian/qt4-dev-tools.install
===================================================================
--- branches/qt4-x11/debian/qt4-dev-tools.install	2007-12-24 21:23:27 UTC (rev 8521)
+++ branches/qt4-x11/debian/qt4-dev-tools.install	2007-12-24 21:27:40 UTC (rev 8522)
@@ -2,4 +2,8 @@
 usr/bin/linguist-qt4
 usr/bin/qdbusviewer
 usr/bin/pixeltool
+usr/bin/assistant_new
+usr/bin/qcollectiongenerator
+usr/bin/qhelpconverter
+usr/bin/qhelpgenerator
 usr/share/qt4/phrasebooks/*