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

Mon Aug 3 21:41:00 UTC 2009

Date: Monday, August 3, 2009 @ 21:40:55
  Author: shlomme
Revision: 9260

Prepare new upstream release

Added:
  packages/python-qt4/trunk/debian/clean
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/compat
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/rules

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

--- packages/python-qt4/trunk/debian/changelog	2009-08-03 21:40:25 UTC (rev 9259)
+++ packages/python-qt4/trunk/debian/changelog	2009-08-03 21:40:55 UTC (rev 9260)
@@ -1,3 +1,27 @@
+python-qt4 (4.5.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Acknowledge NMU. (Thanks, Bastian!)
+    + Closes: #536900
+  * debian/patches/05_license_check.dpatch
+    - Dropped, fixed in new upstream release
+  * debian/control
+    - Added conflict with python-qt4-common to python-qt4 (Closes: #536595)
+    - Bumped standards version to 3.8.2, no changes necessary
+  * debian/rules
+    - Fix install-arch to allow parallel builds (Closes: #539053)
+  * debian/compat
+    - Raise debhelper compatibility level to 7
+
+ -- Torsten Marek <shlomme at debian.org>  Sat, 01 Aug 2009 17:45:27 +0200
+
+python-qt4 (4.5.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix license check. (closes: #536900)
+
+ -- Bastian Blank <waldi at debian.org>  Tue, 28 Jul 2009 19:49:44 +0000
+
 python-qt4 (4.5.1-1) unstable; urgency=low
 
   * New upstream bugfix release

Added: packages/python-qt4/trunk/debian/clean
===================================================================
--- packages/python-qt4/trunk/debian/clean	                        (rev 0)
+++ packages/python-qt4/trunk/debian/clean	2009-08-03 21:40:55 UTC (rev 9260)
@@ -0,0 +1,3 @@
+debian/python-qt4-dbus.install
+designer/python.pro
+designer/Makefile

Modified: packages/python-qt4/trunk/debian/compat
===================================================================
--- packages/python-qt4/trunk/debian/compat	2009-08-03 21:40:25 UTC (rev 9259)
+++ packages/python-qt4/trunk/debian/compat	2009-08-03 21:40:55 UTC (rev 9260)
@@ -1 +1 @@
-5
+7

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2009-08-03 21:40:25 UTC (rev 9259)
+++ packages/python-qt4/trunk/debian/control	2009-08-03 21:40:55 UTC (rev 9260)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.8.1), python-sip4-dev (>= 4.8.1), python-support (>= 0.7.1), dpatch, python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip4-dbg, libqt4-opengl-dev, libphonon-dev (>= 4:4.2.0-2)
+Build-Depends: debhelper (>= 7), python-all-dev, libqt4-dev (>= 4.3.0), sip4 (>= 4.8.2), python-sip4-dev (>= 4.8.2), python-support (>= 0.7.1), dpatch, python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip4-dbg, libqt4-opengl-dev, libphonon-dev (>= 4:4.2.0-2)
 Build-Conflicts: python-xml, python-xml-dbg
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt4/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-qt4/trunk/
@@ -16,6 +16,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-sip4 (>= 4.8.1), python-sip4 (<< 4.9), python-elementtree | python (>= 2.5)
 Suggests: python-qt4-dbg
 Replaces: python-qt4-dev (<< 4.4.4-3~), python-qt4-common
+Conflicts: python-qt4-common
 Description: Python bindings for Qt4
  PyQt4 exposes the Qt4 API to Python. The following modules are supported:
   * QtCore

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2009-08-03 21:40:25 UTC (rev 9259)
+++ packages/python-qt4/trunk/debian/rules	2009-08-03 21:40:55 UTC (rev 9260)
@@ -90,20 +90,50 @@
 install-indep: configure
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
+	dh_prep -i
 	dh_installdirs -i
 	dh_install -i
 
-install-arch: build install-arch-pre $(PYTHONS:%=install-arch-%) install-arch-end
-
-install-arch-pre:
+install-arch: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k -a
+	dh_prep -a
 	dh_installdirs -a
 	sed -i -e '/strip/ d' $(CURDIR)/designer/Makefile
 	rm -f $(CURDIR)/debian/python-qt4-dbus.install
+	# This is needed to enforce that the install-arch-% rules are
+	# not run in parallel. Both rules install into the same directory,
+	# and therefore might try to access the same files at the same time.
+	# Therefore, instead of depending on the install-arch-% rules,
+	# we invoke them explicitly.
+	for p in $(PYTHONS) ; do \
+		$(MAKE) -f debian/rules install-arch-$$p;\
+	done
 
+	dh_install -a
+
+	for i in $$(find debian/python-*-dbg -name '*.so'); do \
+		b=$$(basename $$i .so); \
+		mv $$i $$(dirname $$i)/$${b}_d.so; \
+	done
+
+	find debian/python-*-dbg ! -type d \
+		! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
+
+
+	#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.
+	cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
+
 d_qt4_dbg = debian/python-qt4-dbg
 
 install-arch-%:
@@ -135,40 +165,13 @@
 	fi
 
 
-install-arch-end:
-	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
-
-	for i in $$(find debian/python-*-dbg -name '*.so'); do \
-		b=$$(basename $$i .so); \
-		mv $$i $$(dirname $$i)/$${b}_d.so; \
-	done
-
-	find debian/python-*-dbg ! -type d \
-		! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
-	find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
-
-
-	#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.
-	cp debian/pyuic4 debian/pyqt4-dev-tools/usr/bin/pyuic4
-
-clean: clean-patched unpatch
-clean-patched: 
+clean: 
 	dh_testdir
 	dh_testroot
 	-cd designer && make distclean
-	rm -f designer/python.pro designer/Makefile *-stamp
 	rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) sip/Qt
-	rm -f $(CURDIR)/debian/python-qt4-dbus.install
 	dh_clean
+	$(MAKE) -f debian/rules unpatch
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep


