rev 3189 - trunk/packages/qt-x11-free/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-02-23 20:11:47 +0000 (Thu, 23 Feb 2006)
New Revision: 3189

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:
Make packaging changes necessary for immodule support.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2006-02-23 20:06:50 UTC (rev 3188)
+++ trunk/packages/qt-x11-free/debian/changelog	2006-02-23 20:11:47 UTC (rev 3189)
@@ -9,8 +9,12 @@
     resolve a crash in KMail when viewing exceedingly large mailboxes.
     (Closes: #347392)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+  * Incorporate the immodule patch (and sundry fixes for that patch). Some of
+    the packaging is borrowed from Ubuntu.
+    (Closes: #347377)
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 23 Feb 2006 10:50:07 -0500
+
 qt-x11-free (3:3.3.5-3) 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	2006-02-23 20:06:50 UTC (rev 3188)
+++ trunk/packages/qt-x11-free/debian/libqt3-mt.install	2006-02-23 20:11:47 UTC (rev 3189)
@@ -1,3 +1,4 @@
 usr/lib/libqt-mt.so.*
 usr/lib/libqui.so.1.*
 usr/lib/qt3/plugins/imageformats/libqmng.so
+usr/lib/qt3/plugins/inputmethods/*.so

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2006-02-23 20:06:50 UTC (rev 3188)
+++ trunk/packages/qt-x11-free/debian/rules	2006-02-23 20:11:47 UTC (rev 3189)
@@ -84,6 +84,7 @@
 		-I`pg_config --includedir`	\
 						\
 		-lfontconfig			\
+		-inputmethod			\
 		# End of CONFIGURE_OPTS
 
 interbase_archs := i386 amd64
@@ -110,6 +111,11 @@
 
 	echo yes | ./configure $(CONFIGURE_OPTS)
 
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
+	ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
+	ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
+
 	# proceed
 	make sub-src sub-plugins sub-tools
 	make -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
@@ -139,6 +145,10 @@
 	install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h
 	install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h
 
+	install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/qt3/qinputcontext.h
+	install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/qt3/qinputcontextfactory.h
+	install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/qt3/qinputcontextplugin.h
+
 	touch libqt-thread-stamp
 
 clean: unpatch
@@ -168,6 +178,11 @@
 		config.tests/unix/endian/endiantest lib/qt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
 		extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
 
+	rm -f qmake/*o
+	rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
+	rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
+	rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o
+
 	# delete generated Makefiles but save the toplevel Makefile
 	-mv Makefile Makefile.save
 	for a in `find . -name 'Makefile'`; do rm -f "$$a"; done