[Python-modules-commits] r9589 - in packages/python-qt4/trunk/debian (changelog rules)

[shlomme at users.alioth.debian.org]

    Date: Sunday, August 30, 2009 @ 13:56:33
  Author: shlomme
Revision: 9589

Fix build for Python 2.6

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2009-08-29 19:37:17 UTC (rev 9588)
+++ packages/python-qt4/trunk/debian/changelog	2009-08-30 13:56:33 UTC (rev 9589)
@@ -1,3 +1,10 @@
+python-qt4 (4.5.4-2) UNRELEASED; urgency=low
+
+  * debian/rules
+    - Fix .noinit creation for Python 2.6 by using py_sitename in install-arch-%
+
+ -- Torsten Marek <shlomme at debian.org>  Sun, 30 Aug 2009 15:56:12 +0200
+
 python-qt4 (4.5.4-1) unstable; urgency=low
 
   [ Torsten Marek ]

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-08-29 19:37:17 UTC (rev 9588)
+++ packages/python-qt4/trunk/debian/rules	2009-08-30 13:56:33 UTC (rev 9589)
@@ -121,11 +121,6 @@
 		! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
 	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
 
-	# Don't initiate the uic/widget-plugins in all python versions
-	for pyqt4_ulib_pyversion in $$(ls -d debian/python-qt4/usr/lib/python*); do \
-		touch $$pyqt4_ulib_pyversion/site-packages/PyQt4/uic/widget-plugins/.noinit; \
-	done
-
 	#FIXME - copying the file to /usr/bin is not the best way,
 	# it should be imported properly instead.
 	# probably like ipython handles it.
@@ -142,6 +137,9 @@
 	# remove the Python 3 port for now
 	rm -r $(CURDIR)/debian/tmp/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/uic/port_v3
 
+	# Don't initiate the uic/widget-plugins
+	touch $(CURDIR)/debian/tmp/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/uic/widget-plugins/.noinit
+
 	mv $(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/pyqtconfig.py \
 		$(d_qt4_dbg)/usr/lib/python$*/$(call py_sitename,$*)/PyQt4/pyqtconfig_d.py
 	mkdir -p debian/python-qt4-gl-dbg/usr/lib/python$*/$(call py_sitename,$*)/PyQt4