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

[shlomme at users.alioth.debian.org]

    Date: Tuesday, February 2, 2010 @ 20:33:15
  Author: shlomme
Revision: 11511

Prepare upload to unstable

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/python-qt4-doc.examples
  packages/python-qt4/trunk/debian/rules
Deleted:
  packages/python-qt4/trunk/debian/README.source
  packages/python-qt4/trunk/debian/python-qt4-doc.install

Deleted: packages/python-qt4/trunk/debian/README.source
===================================================================
--- packages/python-qt4/trunk/debian/README.source	2010-02-02 20:30:12 UTC (rev 11510)
+++ packages/python-qt4/trunk/debian/README.source	2010-02-02 20:33:15 UTC (rev 11511)
@@ -1,2 +0,0 @@
-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	2010-02-02 20:30:12 UTC (rev 11510)
+++ packages/python-qt4/trunk/debian/changelog	2010-02-02 20:33:15 UTC (rev 11511)
@@ -1,3 +1,17 @@
+python-qt4 (4.7-2) unstable; urgency=low
+
+  * Uploaded new upstream to unstable
+    (Closes: #567224, #561878, #564657, 558112)
+  * debian/control
+    - Bumped standards version to 3.8.4, no changes necessary
+  * debian/rules
+    - Build rc module for qtdemo.py and don't compress XML files
+      (Closes: #558244)
+  * debian/README.source
+    - Removed, we don't use dpatch anymore
+
+ -- Torsten Marek <shlomme at debian.org>  Tue, 02 Feb 2010 20:59:57 +0100
+
 python-qt4 (4.7-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2010-02-02 20:30:12 UTC (rev 11510)
+++ packages/python-qt4/trunk/debian/control	2010-02-02 20:33:15 UTC (rev 11511)
@@ -5,7 +5,7 @@
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Bernd Zeimetz <bzed at debian.org>
 Build-Depends: debhelper (>= 7), python-all-dev, libqt4-dev (>= 4.3.0), python-sip-dev (>= 4.10), python-support (>= 0.7.1), python-dbus (>= 0.80.0), python-dbus-dbg, libdbus-1-dev (>= 1.0.2), python-all-dbg, python-sip-dbg, libqt4-opengl-dev, libphonon-dev (>= 4:4.2.0-2)
 Build-Conflicts: python-xml, python-xml-dbg
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 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/

Modified: packages/python-qt4/trunk/debian/python-qt4-doc.examples
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-doc.examples	2010-02-02 20:30:12 UTC (rev 11510)
+++ packages/python-qt4/trunk/debian/python-qt4-doc.examples	2010-02-02 20:33:15 UTC (rev 11511)
@@ -1,2 +1 @@
 examples/*
-

Deleted: packages/python-qt4/trunk/debian/python-qt4-doc.install
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-doc.install	2010-02-02 20:30:12 UTC (rev 11510)
+++ packages/python-qt4/trunk/debian/python-qt4-doc.install	2010-02-02 20:33:15 UTC (rev 11511)
@@ -1 +0,0 @@
-doc/*.html usr/share/doc/python-qt4-doc/html

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2010-02-02 20:30:12 UTC (rev 11510)
+++ packages/python-qt4/trunk/debian/rules	2010-02-02 20:33:15 UTC (rev 11511)
@@ -85,12 +85,14 @@
 	$(MAKE) -C dbg-build-$*
 	touch $@
 
-install-indep: configure
+install-indep: build-$(DEFAULT_PYTHON)/build-stamp
 	dh_testdir
 	dh_testroot
 	dh_prep -i
 	dh_installdirs -i
 	dh_install -i
+	dh_installexamples -i
+	$(CURDIR)/build-$(DEFAULT_PYTHON)/pyrcc/pyrcc4 -o $(CURDIR)/debian/python-qt4-doc/usr/share/doc/python-qt4-doc/examples/demos/qtdemo/qtdemo_rc.py $(CURDIR)/examples/demos/qtdemo/qtdemo.qrc 
 
 install-arch: build
 	dh_testdir
@@ -174,7 +176,6 @@
 	dh_installman
 	dh_installchangelogs ChangeLog
 	dh_installdocs -A NEWS THANKS
-	dh_installexamples
 	dh_link
 	dh_sip
 ifeq (,$(findstring -i, $(DH_OPTIONS)))
@@ -189,7 +190,7 @@
 endif
 	dh_pysupport
 	dh_fixperms
-	dh_compress -X.py -X.bmp -X.ui -X.sql
+	dh_compress -X.py -X.bmp -X.ui -X.sql -X.xml
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol