[Python-modules-commits] r25920 - in packages/pyqt5/trunk/debian (4 files)

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

    Date: Monday, September 23, 2013 @ 13:05:40
  Author: mitya57-guest
Revision: 25920

* Delete pycache directories in clean target.
* Regenerate resource files during build.
* Delete built docs and fancybrowser example from upstream tarball
  as they contain non-free jquery version (and we can't build jquery
  resource file when jquery is not in tarball) (closes: #722990).
* Update debian/watch to use dversionmangle.

Modified:
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/pyqt5-doc.links
  packages/pyqt5/trunk/debian/rules
  packages/pyqt5/trunk/debian/watch

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-09-23 12:56:38 UTC (rev 25919)
+++ packages/pyqt5/trunk/debian/changelog	2013-09-23 13:05:40 UTC (rev 25920)
@@ -1,10 +1,19 @@
-pyqt5 (5.0.1-2) UNRELEASED; urgency=low
+pyqt5 (5.0.1+dfsg-1) UNRELEASED; urgency=low
 
+  [ Scott Kitterman ]
   * Install designer plugin in python3-pyqt5
   * Move debug version of libpyqt5qmlplugin.so from python3-pyqt5-dbg to
     python3-pyqt5.qtquick-dbg to match the regular file and avoid duplication
     (Closes: #720679)
 
+  [ Dmitry Shachnev ]
+  * Delete pycache directories in clean target.
+  * Regenerate resource files during build.
+  * Delete built docs and fancybrowser example from upstream tarball
+    as they contain non-free jquery version (and we can't build jquery
+    resource file when jquery is not in tarball) (closes: #722990).
+  * Update debian/watch to use dversionmangle.
+
  -- Scott Kitterman <scott at kitterman.com>  Fri, 23 Aug 2013 23:22:12 -0400
 
 pyqt5 (5.0.1-1) experimental; urgency=low

Modified: packages/pyqt5/trunk/debian/pyqt5-doc.links
===================================================================
--- packages/pyqt5/trunk/debian/pyqt5-doc.links	2013-09-23 12:56:38 UTC (rev 25919)
+++ packages/pyqt5/trunk/debian/pyqt5-doc.links	2013-09-23 13:05:40 UTC (rev 25920)
@@ -1 +1 @@
-usr/share/doc/pyqt5-doc/html/_static/jquery.js  /usr/share/doc/pyqt5-doc/examples/webkit/fancybrowser/jquery.min.js
+#usr/share/doc/pyqt5-doc/html/_static/jquery.js  /usr/share/doc/pyqt5-doc/examples/webkit/fancybrowser/jquery.min.js

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2013-09-23 12:56:38 UTC (rev 25919)
+++ packages/pyqt5/trunk/debian/rules	2013-09-23 13:05:40 UTC (rev 25920)
@@ -6,6 +6,10 @@
 
 py3_dbusmoddir = $(shell python3 -c 'import dbus.mainloop; print(dbus.mainloop.__path__[0])')
 
+debian_version = $(word 2,$(shell dpkg-parsechangelog | grep ^Version:))
+upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
+upstream_version = $(subst ~,,$(firstword $(subst +, ,$(debian_version))))
+
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 export QMAKESPEC=/usr/share/qt5/mkspecs/linux-g++
@@ -95,12 +99,11 @@
 	dh_installdirs -i
 	dh_install -i --list-missing
 	dh_installexamples -i
-	# Use python3 shebangs
+	# Use python3 shebangs and regenerate resource files
 	cd $(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/examples/; \
-		find . -name '*.py' -exec sed -i 's/\/env python/\/python3/g' {} +
-	#$(CURDIR)/build-$(DEFAULT_PYTHON)/pyrcc/pyrcc5 -o \
-	#	$(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/examples/demos/qtdemo/qtdemo_rc.py \
-	#	$(CURDIR)/examples/demos/qtdemo/qtdemo.qrc 
+		find . -name '*.py' -exec sed -i 's/\/env python/\/python3/g' {} +; \
+		find . -name '*.qrc' | sed 's/\.qrc//g' | xargs -I {} \
+		$(CURDIR)/build-$(DEFAULT_PYTHON)/pyrcc/pyrcc5 {}.qrc -o {}_rc.py
 
 install-arch: build-arch
 	dh_testdir
@@ -165,6 +168,7 @@
 	dh_testdir
 	dh_testroot
 	rm -rf $(PYTHON3S:%=build-%) $(PYTHON3S:%=dbg-build-%)
+	find . -type d -name __pycache__ | xargs rm -rf
 	cd sip; rm -rf Qt opengl_types.sip pyqt-gpl.sip5
 	dh_clean
 
@@ -225,4 +229,7 @@
 
 binary: binary-arch binary-indep
 
-.PHONY: build-indep build-arch build clean binary-indep binary-arch binary configure
+get-orig-source:
+	sh $(CURDIR)/debian/get-orig-source.sh $(upstream_dfsg_version)
+
+.PHONY: build-indep build-arch build clean binary-indep binary-arch binary configure get-orig-source

Modified: packages/pyqt5/trunk/debian/watch
===================================================================
--- packages/pyqt5/trunk/debian/watch	2013-09-23 12:56:38 UTC (rev 25919)
+++ packages/pyqt5/trunk/debian/watch	2013-09-23 13:05:40 UTC (rev 25920)
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://sf.net/pyqt/PyQt-gpl-(.*)\.tar\.gz debian uupdate