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

[Christopher Martin]

Author: chrsmrtn
Date: 2005-09-16 14:44:42 +0000 (Fri, 16 Sep 2005)
New Revision: 1806

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:
Merge all changes from people/chrsmrtn. interbase is back, style splitout reverted, etc.

3.3.4 vs. 3.3.5 still to be decided.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-09-16 14:38:44 UTC (rev 1805)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-09-16 14:44:42 UTC (rev 1806)
@@ -17,9 +17,15 @@
 
   * Add a patch from the "Improving KDE" set that tweaks KDE's default GUI,
     changing some of the selection and highlight effects.
-  
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri,  9 Sep 2005 08:35:43 -0400
 
+  * Revert the splitting out of the Qt style plugins, as this caused hassles
+    for developers trying to create their own styles, and also problems with
+    PyQt. (Closes: #327360, #328109)
+
+  * Re-enable InterBase support, now that firebird2 has been built with gcc4.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 16 Sep 2005 10:39:34 -0400
+
 qt-x11-free (3:3.3.4-8) unstable; urgency=low
 
   +++ Changes by Christopher Martin:

Modified: trunk/packages/qt-x11-free/debian/libqt3-mt.install
===================================================================
--- trunk/packages/qt-x11-free/debian/libqt3-mt.install	2005-09-16 14:38:44 UTC (rev 1805)
+++ trunk/packages/qt-x11-free/debian/libqt3-mt.install	2005-09-16 14:44:42 UTC (rev 1806)
@@ -1,10 +1,3 @@
 usr/lib/libqt-mt.so.*
 usr/lib/libqui.so.1.*
 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-16 14:38:44 UTC (rev 1805)
+++ trunk/packages/qt-x11-free/debian/rules	2005-09-16 14:44:42 UTC (rev 1806)
@@ -84,14 +84,6 @@
 		-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
 
 ifneq ($(DEB_HOST_ARCH_CPU),i386)
@@ -99,9 +91,6 @@
 	IBASE = -Nlibqt3-mt-ibase
 else
 	IBASE =
-	# Completely disable InterBase support because of #317314.
-	CONFIGURE_OPTS += -no-sql-ibase
-	IBASE = -Nlibqt3-mt-ibase
 endif
 
 ifeq ($(DEB_HOST_ARCH),arm)