[Pkg-kde-commits] rev 1681 - trunk/packages/qt-x11-free/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-09-04 23:42:39 +0000 (Sun, 04 Sep 2005)
New Revision: 1681

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/libqt3-mt.install
   trunk/packages/qt-x11-free/debian/rules
Log:
More merging:

  * Build jpeg support into Qt, not as a plugin.

  * Build the Qt styles as plugins. This does not affect the Qt buildkey,
    so shouldn't affect other packages.



Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-09-04 23:42:26 UTC (rev 1680)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-09-04 23:42:39 UTC (rev 1681)
@@ -41,6 +41,11 @@
     - pass -tablet to configure.
     - add libxi-dev to Build-Depends.
 
+  * Build jpeg support into Qt, not as a plugin.
+
+  * Build the Qt styles as plugins. This does not affect the Qt buildkey,
+    so shouldn't affect other packages.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
 
 qt-x11-free (3:3.3.4-7) unstable; urgency=low

Modified: trunk/packages/qt-x11-free/debian/libqt3-mt.install
===================================================================
--- trunk/packages/qt-x11-free/debian/libqt3-mt.install	2005-09-04 23:42:26 UTC (rev 1680)
+++ trunk/packages/qt-x11-free/debian/libqt3-mt.install	2005-09-04 23:42:39 UTC (rev 1681)
@@ -1,4 +1,10 @@
 usr/lib/libqt-mt.so.*
 usr/lib/libqui.so.1.*
-usr/lib/qt3/plugins/imageformats/libqjpeg.so
 usr/lib/qt3/plugins/imageformats/libqmng.so
+usr/lib/qt3/plugins/styles/libqcdestyle.so
+usr/lib/qt3/plugins/styles/libqcompactstyle.so
+usr/lib/qt3/plugins/styles/libqmotifplusstyle.so
+usr/lib/qt3/plugins/styles/libqmotifstyle.so
+usr/lib/qt3/plugins/styles/libqplatinumstyle.so
+usr/lib/qt3/plugins/styles/libqsgistyle.so
+usr/lib/qt3/plugins/styles/libqwindowsstyle.so

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2005-09-04 23:42:26 UTC (rev 1680)
+++ trunk/packages/qt-x11-free/debian/rules	2005-09-04 23:42:39 UTC (rev 1681)
@@ -70,6 +70,7 @@
 						\
 		-qt-gif				\
 		-qt-imgfmt-png			\
+		-qt-imgfmt-jpeg			\
 		-plugin-imgfmt-mng		\
 		-plugin-imgfmt-jpeg		\
 						\
@@ -84,8 +85,15 @@
 		-I`pg_config --includedir`	\
 						\
 		-lfontconfig			\
+						\
+		-plugin-style-cde		\
+		-plugin-style-compact		\
+		-plugin-style-motif		\
+		-plugin-style-motifplus		\
+		-plugin-style-platinum		\
+		-plugin-style-sgi		\
+		-plugin-style-windows		\
 		# End of CONFIGURE_OPTS
-		# TODO: Styles as plugins?
 
 ifneq ($(DEB_HOST_ARCH_CPU),i386)
 	CONFIGURE_OPTS += -no-sql-ibase