[Python-modules-commits] r27155 - in packages/pyqt5/trunk/debian (7 files)

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

    Date: Saturday, January 11, 2014 @ 13:53:31
  Author: mitya57-guest
Revision: 27155

Split examples into their own package, pyqt5-examples.

Added:
  packages/pyqt5/trunk/debian/pyqt5-examples.examples
    (from rev 26885, packages/pyqt5/trunk/debian/pyqt5-doc.examples)
  packages/pyqt5/trunk/debian/pyqt5-examples.links
    (from rev 26885, packages/pyqt5/trunk/debian/pyqt5-doc.links)
Modified:
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/control
  packages/pyqt5/trunk/debian/rules
Deleted:
  packages/pyqt5/trunk/debian/pyqt5-doc.examples
  packages/pyqt5/trunk/debian/pyqt5-doc.links

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2014-01-11 13:46:14 UTC (rev 27154)
+++ packages/pyqt5/trunk/debian/changelog	2014-01-11 13:53:31 UTC (rev 27155)
@@ -5,6 +5,7 @@
     - Don’t set -x in import autopkgtest.
     - Test QtDBus module as well.
   * Add new package for QtX11Extras module.
+  * Split examples into their own package, pyqt5-examples.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 10 Jan 2014 21:36:59 +0400
 

Modified: packages/pyqt5/trunk/debian/control
===================================================================
--- packages/pyqt5/trunk/debian/control	2014-01-11 13:46:14 UTC (rev 27154)
+++ packages/pyqt5/trunk/debian/control	2014-01-11 13:53:31 UTC (rev 27155)
@@ -363,14 +363,21 @@
 Package: pyqt5-doc
 Architecture: all
 Section: doc
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Suggests: pyqt5-examples
+Description: Documentation for PyQt5
+ PyQt5 exposes the Qt5 GUI toolkit in Python.
+ .
+ This package contains Python-specific documentation for PyQt5.
+
+Package: pyqt5-examples
+Architecture: all
 Suggests: qt5-doc
-Depends: libjs-jquery, ${sphinxdoc:Depends}, ${misc:Depends}
-Recommends: python3-pyqt5
-Description: Documentation and examples for PyQt5
+Depends: python3-pyqt5, libjs-jquery, ${misc:Depends}
+Description: Examples and demos for PyQt5
  PyQt5 exposes the Qt5 GUI toolkit in Python.
  .
- This package contains Python-specific documentation for PyQt5 and
- the Qt example programs ported to Python.
+ This package the Qt example programs and demos ported to Python.
 
 Package: pyqt5-dev-tools
 Depends: python3,

Deleted: packages/pyqt5/trunk/debian/pyqt5-doc.examples
===================================================================
--- packages/pyqt5/trunk/debian/pyqt5-doc.examples	2014-01-11 13:46:14 UTC (rev 27154)
+++ packages/pyqt5/trunk/debian/pyqt5-doc.examples	2014-01-11 13:53:31 UTC (rev 27155)
@@ -1 +0,0 @@
-examples/*

Deleted: packages/pyqt5/trunk/debian/pyqt5-doc.links
===================================================================
--- packages/pyqt5/trunk/debian/pyqt5-doc.links	2014-01-11 13:46:14 UTC (rev 27154)
+++ packages/pyqt5/trunk/debian/pyqt5-doc.links	2014-01-11 13:53:31 UTC (rev 27155)
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.min.js usr/share/doc/pyqt5-doc/examples/webkit/fancybrowser/jquery.min.js

Copied: packages/pyqt5/trunk/debian/pyqt5-examples.examples (from rev 26885, packages/pyqt5/trunk/debian/pyqt5-doc.examples)
===================================================================
--- packages/pyqt5/trunk/debian/pyqt5-examples.examples	                        (rev 0)
+++ packages/pyqt5/trunk/debian/pyqt5-examples.examples	2014-01-11 13:53:31 UTC (rev 27155)
@@ -0,0 +1 @@
+examples/*

Copied: packages/pyqt5/trunk/debian/pyqt5-examples.links (from rev 26885, packages/pyqt5/trunk/debian/pyqt5-doc.links)
===================================================================
--- packages/pyqt5/trunk/debian/pyqt5-examples.links	                        (rev 0)
+++ packages/pyqt5/trunk/debian/pyqt5-examples.links	2014-01-11 13:53:31 UTC (rev 27155)
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.min.js usr/share/doc/pyqt5-examples/examples/webkit/fancybrowser/jquery.min.js

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2014-01-11 13:46:14 UTC (rev 27154)
+++ packages/pyqt5/trunk/debian/rules	2014-01-11 13:53:31 UTC (rev 27155)
@@ -98,15 +98,15 @@
 	dh_install -i --fail-missing
 	dh_installexamples -Xactiveqt -i
 	# Use python3 shebangs and regenerate resource files
-	cd $(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/examples/; \
+	cd $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/; \
 		cp /usr/share/javascript/jquery/jquery.min.js webkit/fancybrowser/; \
 		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
 	# Symlink duplicate files in examples. Based on Andrew Starr-Bochicchio's
 	# code in ubuntu-packaging-guide.
-	cd $(CURDIR)/debian/pyqt5-doc && \
-	fdupes -r1nq usr/share/doc/pyqt5-doc/examples | while read s; do \
+	cd $(CURDIR)/debian/pyqt5-examples && \
+	fdupes -r1nq usr/share/doc/pyqt5-examples/examples | while read s; do \
 		set -- $$(echo $$s | tr ' ' '\n' | sort); \
 		f=$$1; shift; for d; do \
 			echo "symlinking identical file $$d to $$f"; \
@@ -216,15 +216,15 @@
 		ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
 	done
 endif
-	dh_python3 --no-dbg-cleaning -N pyqt5-dev-tools -N pyqt5-doc
+	dh_python3 --no-dbg-cleaning -N pyqt5-dev-tools -N pyqt5-examples
 	rm -rf $(CURDIR)/debian/python3-pyqt5/usr/lib/python3/dist-packages/PyQt5/uic/port_v2
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/bin
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/share/sip
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/lib/python3/dist-packages/PyQt5/uic
 	rm -rf $(CURDIR)/debian/python3-pyqt5-dbg/usr/lib/python3/dist-packages/dbus
-	rm -rf $(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/examples/webkit/googlechat
-	rm -rf $(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/examples/designer/plugins/python/__pycache__
-	rm -rf $(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/examples/designer/plugins/widgets/__pycache__
+	rm -rf $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/webkit/googlechat
+	rm -rf $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/designer/plugins/python/__pycache__
+	rm -rf $(CURDIR)/debian/pyqt5-examples/usr/share/doc/pyqt5-examples/examples/designer/plugins/widgets/__pycache__
 	dh_fixperms
 	dh_compress -Xexamples
 	dh_installdeb