[Pkg-kde-commits] rev 1796 - people/chrsmrtn/qt-x11-free/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2005-09-14 19:25:27 +0000 (Wed, 14 Sep 2005)
New Revision: 1796

Modified:
   people/chrsmrtn/qt-x11-free/debian/changelog
   people/chrsmrtn/qt-x11-free/debian/libqt3-mt.install
   people/chrsmrtn/qt-x11-free/debian/rules
Log:
For the people/chrsmrtn Qt, commit the split-out-revert, and assume that
firebird2 will clear NEW soon.

These changes will make trunk soon, hopefully.


Modified: people/chrsmrtn/qt-x11-free/debian/changelog
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/changelog	2005-09-14 10:50:54 UTC (rev 1795)
+++ people/chrsmrtn/qt-x11-free/debian/changelog	2005-09-14 19:25:27 UTC (rev 1796)
@@ -17,11 +17,15 @@
 
   * Add a patch from the "Improving KDE" set that tweaks KDE's default GUI,
     changing some of the selection and highlight effects.
-  
-  * Re-enable InterBase support. [!!! Not yet ready !!!]
 
- -- 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>  Tue, 13 Sep 2005 12:40:18 -0400
+
 qt-x11-free (3:3.3.4-8) unstable; urgency=low
 
   +++ Changes by Christopher Martin:

Modified: people/chrsmrtn/qt-x11-free/debian/libqt3-mt.install
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/libqt3-mt.install	2005-09-14 10:50:54 UTC (rev 1795)
+++ people/chrsmrtn/qt-x11-free/debian/libqt3-mt.install	2005-09-14 19:25:27 UTC (rev 1796)
@@ -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: people/chrsmrtn/qt-x11-free/debian/rules
===================================================================
--- people/chrsmrtn/qt-x11-free/debian/rules	2005-09-14 10:50:54 UTC (rev 1795)
+++ people/chrsmrtn/qt-x11-free/debian/rules	2005-09-14 19:25:27 UTC (rev 1796)
@@ -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)