[Python-modules-commits] r9547 - in packages/python-qt4/trunk/debian (5 files)

[ncommander-guest at users.alioth.debian.org]

    Date: Friday, August 28, 2009 @ 07:11:47
  Author: ncommander-guest
Revision: 9547

* Reinstalled uic/widget-plugins at upstream location (Closes: #541475)
  - Adapted debian/rules and python-qt4.install
  - Thanks Didier Raboud for the patch
* debian/control:
  - Bumped standards version to 3.8.3
  - Add Break: python-kde4 (<< 4:4.2.4) due to ABI change (Closes: #540057)

Added:
  packages/python-qt4/trunk/debian/README.source
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/patches/00list
  packages/python-qt4/trunk/debian/python-qt4.install
  packages/python-qt4/trunk/debian/rules

Added: packages/python-qt4/trunk/debian/README.source
===================================================================
--- packages/python-qt4/trunk/debian/README.source	                        (rev 0)
+++ packages/python-qt4/trunk/debian/README.source	2009-08-28 07:11:47 UTC (rev 9547)
@@ -0,0 +1,2 @@
+This package uses dpatch as its patch management system. See
+/usr/share/doc/dpatch/README.source.gz for more information.

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2009-08-28 06:51:26 UTC (rev 9546)
+++ packages/python-qt4/trunk/debian/changelog	2009-08-28 07:11:47 UTC (rev 9547)
@@ -1,5 +1,6 @@
-python-qt4 (4.5.4-1) unstable; urgency=low
+python-qt4 (4.5.4-1) UNRELEASED; urgency=low
 
+  [ Torsten Marek ]
   * New upstream release
   * Acknowledge NMU. (Thanks, Bastian!)
     + Closes: #536900
@@ -13,8 +14,16 @@
   * debian/compat
     - Raise debhelper compatibility level to 7
 
- -- Torsten Marek <shlomme at debian.org>  Sat, 01 Aug 2009 17:45:27 +0200
+  [ Michael Casadevall ]
+  * Reinstalled uic/widget-plugins at upstream location (Closes: #541475)
+    - Adapted debian/rules and python-qt4.install
+    - Thanks Didier Raboud for the patch
+  * debian/control:
+    - Bumped standards version to 3.8.3
+    - Add Break: python-kde4 (<< 4:4.2.4) due to ABI change (Closes: #540057)
 
+ -- Michael Casadevall <mcasadevall at debian.org>  Fri, 28 Aug 2009 02:37:13 -0400
+
 python-qt4 (4.5.1-1.1) unstable; urgency=low
 
   * Non-maintainer upload.

Modified: packages/python-qt4/trunk/debian/patches/00list
===================================================================
--- packages/python-qt4/trunk/debian/patches/00list	2009-08-28 06:51:26 UTC (rev 9546)
+++ packages/python-qt4/trunk/debian/patches/00list	2009-08-28 07:11:47 UTC (rev 9547)
@@ -1,4 +1,4 @@
 01_configure
 02_htmllinks
 03_qreal_float_support
-04_widget-plugins_location.dpatch
+05_license-check

Modified: packages/python-qt4/trunk/debian/python-qt4.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4.install	2009-08-28 06:51:26 UTC (rev 9546)
+++ packages/python-qt4/trunk/debian/python-qt4.install	2009-08-28 07:11:47 UTC (rev 9547)
@@ -12,6 +12,6 @@
 usr/lib/python*/*-packages/PyQt4/QtWebKit.so
 usr/lib/python*/*-packages/PyQt4/QtXml.so
 usr/lib/python*/*-packages/PyQt4/QtXmlPatterns.so
-usr/lib/python*/*-packages/PyQt4/uic/
+usr/lib/python*/*-packages/PyQt4/uic/*
 usr/lib/python*/*-packages/PyQt4/pyqtconfig.py
 usr/lib/qt4/*

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-08-28 06:51:26 UTC (rev 9546)
+++ packages/python-qt4/trunk/debian/rules	2009-08-28 07:11:47 UTC (rev 9547)
@@ -121,14 +121,11 @@
 		! \( -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
 
-	#move widget plugins to a sane place
-	mkdir -p debian/python-qt4/usr/share/python-qt4
-	mv debian/python-qt4/usr/lib/python$(DEFAULT_PYTHON)/*-packages/PyQt4/uic/widget-plugins \
-	   debian/python-qt4/usr/share/python-qt4
-	touch debian/python-qt4/usr/share/python-qt4/widget-plugins/.noinit
-	rm -rf debian/*/usr/lib/*/*-packages/PyQt4/uic/widget-plugins
-
 	#FIXME - copying the file to /usr/bin is not the best way,
 	# it should be imported properly instead.
 	# probably like ipython handles it.