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

[kitterman at users.alioth.debian.org]

    Date: Saturday, August 3, 2013 @ 21:03:53
  Author: kitterman
Revision: 25361

* Feedback changes from Ubuntu:
  - Add autopkg test, to check that at least a basic import works, should
    catch API version changes in sip4.
  - Unify build targets across py2 & 3, both now multiarched and python3.2
    is not supported

Added:
  packages/python-qt4/trunk/debian/tests/
  packages/python-qt4/trunk/debian/tests/control
  packages/python-qt4/trunk/debian/tests/import
Modified:
  packages/python-qt4/trunk/debian/changelog
  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	2013-08-03 18:03:00 UTC (rev 25360)
+++ packages/python-qt4/trunk/debian/changelog	2013-08-03 21:03:53 UTC (rev 25361)
@@ -1,10 +1,18 @@
-python-qt4 (4.10.2-2) UNRELEASED; urgency=low
+python-qt4 (4.10.2-2) unstable; urgency=low
 
+  [ Dmitry Shachnev ]
   * Update dh_compress arguments so that pagefold.qss and wordlist.txt
     (in python-qt4-doc examples) are not compressed.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 10 Jul 2013 19:36:33 +0400
+  [ Scott Kitterman ]
+  * Feedback changes from Ubuntu:
+    - Add autopkg test, to check that at least a basic import works, should
+      catch API version changes in sip4.
+    - Unify build targets across py2 & 3, both now multiarched and python3.2
+      is not supported
 
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 03 Aug 2013 16:16:20 -0400
+
 python-qt4 (4.10.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2013-08-03 18:03:00 UTC (rev 25360)
+++ packages/python-qt4/trunk/debian/control	2013-08-03 21:03:53 UTC (rev 25361)
@@ -18,7 +18,7 @@
                python-all-dbg,
                python-all-dev (>= 2.7.2-5~),
                python3-all-dbg,
-               python3-all-dev (>= 3.2.3-6~),
+               python3-all-dev (>= 3.3),
                python-dbus (>= 1.0.0~),
                python-dbus-dbg,
                python3-dbus,
@@ -36,6 +36,7 @@
 Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-qt4/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-qt4/trunk/
+XS-Testsuite: autopkgtest
 
 Package: python-qt4
 Architecture: any

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2013-08-03 18:03:00 UTC (rev 25360)
+++ packages/python-qt4/trunk/debian/rules	2013-08-03 21:03:53 UTC (rev 25361)
@@ -75,25 +75,17 @@
 			$(if $(filter $(DEFAULT_PYTHON),$*),,--no-designer-plugin) 
 	touch $@
 
-dbg-build-3.3/configure-stamp:
-	dh_testdir
-	mkdir -p dbg-build-3.3
-	cd dbg-build-3.3 && python3.3-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
-			-m $(shell python3.3-dbg-config --configdir) \
-			-l /usr/include/python3.3dm \
-			-d /usr/lib/python3.3/$(call py_sitename, 3.3) \
-			--no-designer-plugin
-	touch $@
-
 dbg-build-%/configure-stamp:
 	dh_testdir
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && python$*-dbg ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
-			-m  $(shell python$*-dbg-config --configdir) \
-			-l /usr/include/python$*_d \
- 			-d /usr/lib/python$*/$(call py_sitename, $*) \
- 			--no-designer-plugin
+			-m $(shell python$*-dbg-config --configdir) \
+			-l /usr/include/python$*$(if $(filter 3.%, $*),dm,_d) \
+			-d /usr/lib/python$*/$(call py_sitename, $*) \
+			--no-designer-plugin
+	touch $@
 
+
 build: build-arch build-indep
 build-arch: $(PYTHON3S:%=pyqtconfig-%) $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
 build-indep: build-$(DEFAULT_PYTHON)/build-stamp

Added: packages/python-qt4/trunk/debian/tests/control
===================================================================
--- packages/python-qt4/trunk/debian/tests/control	                        (rev 0)
+++ packages/python-qt4/trunk/debian/tests/control	2013-08-03 21:03:53 UTC (rev 25361)
@@ -0,0 +1,2 @@
+Tests: import
+Depends: python-qt4

Added: packages/python-qt4/trunk/debian/tests/import
===================================================================
--- packages/python-qt4/trunk/debian/tests/import	                        (rev 0)
+++ packages/python-qt4/trunk/debian/tests/import	2013-08-03 21:03:53 UTC (rev 25361)
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+python -c 'from PyQt4 import QtGui'