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

mitya57-guest at users.alioth.debian.org mitya57-guest at users.alioth.debian.org
Thu Nov 21 17:24:11 UTC 2013 

    Date: Thursday, November 21, 2013 @ 17:24:10
  Author: mitya57-guest
Revision: 26457

Import 4.10.3+dfsg1-1 release

Added:
  packages/python-qt4/trunk/debian/python-qt4-doc.docs
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/control
  packages/python-qt4/trunk/debian/get-orig-source.sh
  packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
  packages/python-qt4/trunk/debian/python-qt4-doc.examples
  packages/python-qt4/trunk/debian/rules
Deleted:
  packages/python-qt4/trunk/debian/README.Debian

Deleted: packages/python-qt4/trunk/debian/README.Debian
===================================================================
--- packages/python-qt4/trunk/debian/README.Debian	2013-11-21 17:20:20 UTC (rev 26456)
+++ packages/python-qt4/trunk/debian/README.Debian	2013-11-21 17:24:10 UTC (rev 26457)
@@ -1,5 +0,0 @@
-There are a number of examples shipped in the python-qt4-doc package. In order
-to run them, you will need to copy them from
-/usr/share/doc/python-qt4-doc/examples to a location where you have write
-priviledges.  After copying them, you can excecute demos/qtdemo/qtdemo.py and
-it will provide a graphical mechanism to run the various demos.

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2013-11-21 17:20:20 UTC (rev 26456)
+++ packages/python-qt4/trunk/debian/changelog	2013-11-21 17:24:10 UTC (rev 26457)
@@ -1,3 +1,16 @@
+python-qt4 (4.10.3+dfsg1-1) unstable; urgency=low
+
+  * get-orig-source.sh: Only remove the _static folder, as we still
+    need some files in html that are not generated by Sphinx.
+  * Re-add debian/python-qt4-doc.docs (closes: #729993).
+  * Remove obsolete README.debian, examples work fine now.
+  * Do not install Windows-specific activeqt examples.
+  * Add description to debian_configure_changes.diff.
+  * Remove leftover debug output from debian/rules.
+  * Symlink duplicate files in examples using fdupes.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 20 Nov 2013 12:25:42 +0400
+
 python-qt4 (4.10.3+dfsg-1) unstable; urgency=low
 
   * Update pyrcc4 man page to list -py2 and -py3 options.

Modified: packages/python-qt4/trunk/debian/control
===================================================================
--- packages/python-qt4/trunk/debian/control	2013-11-21 17:20:20 UTC (rev 26456)
+++ packages/python-qt4/trunk/debian/control	2013-11-21 17:24:10 UTC (rev 26457)
@@ -9,6 +9,7 @@
            Dmitry Shachnev <mitya57 at gmail.com>
 Build-Depends: dpkg-dev (>= 1.16.1~),
                debhelper (>= 7),
+               fdupes,
                libicu-dev,
                libdbus-1-dev (>= 1.0.2),
                libphonon-dev (>= 4:4.2.0-2),

Modified: packages/python-qt4/trunk/debian/get-orig-source.sh
===================================================================
--- packages/python-qt4/trunk/debian/get-orig-source.sh	2013-11-21 17:20:20 UTC (rev 26456)
+++ packages/python-qt4/trunk/debian/get-orig-source.sh	2013-11-21 17:24:10 UTC (rev 26457)
@@ -21,8 +21,8 @@
 
 mv PyQt-x11-gpl-* "python-qt4-${dfsg_version}.orig"
 
-# jquery.min.js
-rm -rf "python-qt4-${dfsg_version}.orig/doc/html/"
+# minimized jquery and underscore
+rm -rf "python-qt4-${dfsg_version}.orig/doc/html/_static"
 rm -f "python-qt4-${dfsg_version}.orig/examples/webkit/fancybrowser/jquery.min.js"
 rm -f "python-qt4-${dfsg_version}.orig/examples/webkit/fancybrowser/jquery_rc2.py"
 rm -f "python-qt4-${dfsg_version}.orig/examples/webkit/fancybrowser/jquery_rc3.py"

Modified: packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2013-11-21 17:20:20 UTC (rev 26456)
+++ packages/python-qt4/trunk/debian/patches/debian_configure_changes.diff	2013-11-21 17:24:10 UTC (rev 26457)
@@ -1,7 +1,9 @@
-Index: python-qt4-4.10.3/configure.py
-===================================================================
---- python-qt4-4.10.3.orig/configure.py	2013-08-21 23:31:24.192872067 -0400
-+++ python-qt4-4.10.3/configure.py	2013-08-21 23:31:24.184872068 -0400
+Description: disable elementtree and pyuic4 wrapper
+Forwarded: not-needed
+Last-Update: 2013-11-20
+
+--- a/configure.py
++++ b/configure.py
 @@ -863,31 +863,6 @@
              makefile.generate()
              tool.append("dbus")

Added: packages/python-qt4/trunk/debian/python-qt4-doc.docs
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-doc.docs	                        (rev 0)
+++ packages/python-qt4/trunk/debian/python-qt4-doc.docs	2013-11-21 17:24:10 UTC (rev 26457)
@@ -0,0 +1 @@
+doc/html

Modified: packages/python-qt4/trunk/debian/python-qt4-doc.examples
===================================================================
--- packages/python-qt4/trunk/debian/python-qt4-doc.examples	2013-11-21 17:20:20 UTC (rev 26456)
+++ packages/python-qt4/trunk/debian/python-qt4-doc.examples	2013-11-21 17:24:10 UTC (rev 26457)
@@ -1,2 +1 @@
 examples/*
-debian/README.Debian

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2013-11-21 17:20:20 UTC (rev 26456)
+++ packages/python-qt4/trunk/debian/rules	2013-11-21 17:24:10 UTC (rev 26457)
@@ -110,13 +110,23 @@
 	dh_prep -i
 	dh_installdirs -i
 	dh_install -i
-	dh_installexamples -i
+	dh_installexamples -Xactiveqt -i
 	cd $(CURDIR)/debian/python-qt4-doc/usr/share/doc/python-qt4-doc/examples/; \
 		cp /usr/share/javascript/jquery/jquery.min.js webkit/fancybrowser/; \
 		find . -name '*.qrc' | sed 's/\.qrc//g' | xargs -I {} \
 			$(CURDIR)/build-$(DEFAULT_PYTHON)/pyrcc/pyrcc4 -py2 {}.qrc -o {}_rc2.py; \
 		find . -name '*.qrc' | sed 's/\.qrc//g' | xargs -I {} \
 			$(CURDIR)/build-$(DEFAULT_PYTHON)/pyrcc/pyrcc4 -py3 {}.qrc -o {}_rc3.py
+	# Symlink duplicate files in examples. Based on Andrew Starr-Bochicchio's
+	# code in ubuntu-packaging-guide.
+	cd $(CURDIR)/debian/python-qt4-doc && \
+	fdupes -r1nq usr/share/doc/python-qt4-doc/examples | while read s; do \
+		set -- $$(echo $$s | tr ' ' '\n' | sort); \
+		f=$$1; shift; for d; do \
+			echo "symlinking identical file $$d to $$f"; \
+			rm $$d; ln -s /$$f $$d; \
+		done; \
+	done
 	dh_link -i
 
 install-arch: build-arch
@@ -163,7 +173,6 @@
 		$(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/dbus/mainloop; \
 		echo 'usr/lib/python3.$*/dist-packages/*' >> $(CURDIR)/debian/python3-dbus.mainloop.qt.install;\
 	fi
-	ls $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt4 > ../list
 	mv $(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig.py \
 		$(CURDIR)/debian/tmp/usr/lib/python3.$*/dist-packages/PyQt4/pyqtconfig_nd$*.py

More information about the Python-modules-commits mailing list