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

[kitterman at users.alioth.debian.org]

    Date: Sunday, October 13, 2013 @ 12:21:44
  Author: kitterman
Revision: 26152

* New upstream release
* Remove debian/patches/libpython_multiarch.diff, equivalent change
  incorporated upstream (and debian/patches directory since there are no
  other patches)
* Add README.source to document how to make DFSG tarball
* Repack tarball to remove minified javascript from docs and fancybrowser
  example (Closes: #722990).

Added:
  packages/pyqt5/trunk/debian/README.source
Modified:
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/rules
Deleted:
  packages/pyqt5/trunk/debian/patches/

Added: packages/pyqt5/trunk/debian/README.source
===================================================================
--- packages/pyqt5/trunk/debian/README.source	                        (rev 0)
+++ packages/pyqt5/trunk/debian/README.source	2013-10-13 12:21:44 UTC (rev 26152)
@@ -0,0 +1,8 @@
+Preparing DFSG free tarball:
+
+As of pyqt5-5.1 remove the following files (which are all minified javascript
+which do not have source provided) and reroll the tarball:
+
+examples/webkit/fancybrowser/jquery.min.js
+doc/html/_static/jquery.js
+doc/html/_static/underscore.js

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-10-13 11:36:27 UTC (rev 26151)
+++ packages/pyqt5/trunk/debian/changelog	2013-10-13 12:21:44 UTC (rev 26152)
@@ -1,21 +1,25 @@
-pyqt5 (5.0.1+dfsg-1) UNRELEASED; urgency=low
+pyqt5 (5.1+dfsg-1) unstable; urgency=low
 
   [ Scott Kitterman ]
+  * New upstream release
   * 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)
+  * Remove debian/patches/libpython_multiarch.diff, equivalent change
+    incorporated upstream (and debian/patches directory since there are no
+    other patches)
+  * Add README.source to document how to make DFSG tarball
 
   [ 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).
+  * Repack tarball to remove minified javascript from docs and fancybrowser
+    example (Closes: #722990).
   * Update debian/watch to use dversionmangle.
   * Build QML plugin only for the default Python version.
 
- -- Scott Kitterman <scott at kitterman.com>  Fri, 23 Aug 2013 23:22:12 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 13 Oct 2013 07:53:00 -0400
 
 pyqt5 (5.0.1-1) experimental; urgency=low
 

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2013-10-13 11:36:27 UTC (rev 26151)
+++ packages/pyqt5/trunk/debian/rules	2013-10-13 12:21:44 UTC (rev 26152)
@@ -57,6 +57,8 @@
 	dh_testdir
 	mkdir -p build-$*
 	ln -s ../sip build-$*/sip
+	ln -s /usr/share/javascript/sphinxdoc/1.0/jquery.js \
+		examples/webkit/fancybrowser/jquery.min.js
 	cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
 			-m $(shell python$*-config --configdir) \
 			-d /usr/lib/python$*/dist-packages \