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

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

    Date: Tuesday, October 15, 2013 @ 14:01:38
  Author: mitya57-guest
Revision: 26163

* Add debian/get-orig-source.sh and explain how to use it in
  README.source; add jquery_rc.py to list of non-free files.
* Remove symlink to jquery in clean target.

Added:
  packages/pyqt5/trunk/debian/get-orig-source.sh
Modified:
  packages/pyqt5/trunk/debian/README.source
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/rules

Modified: packages/pyqt5/trunk/debian/README.source
===================================================================
--- packages/pyqt5/trunk/debian/README.source	2013-10-15 09:55:19 UTC (rev 26162)
+++ packages/pyqt5/trunk/debian/README.source	2013-10-15 14:01:38 UTC (rev 26163)
@@ -1,8 +1,9 @@
 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:
+To repack upstream source without non-free files, use 'get-orig-source'
+target in debian/rules. Non-free files are:
 
 examples/webkit/fancybrowser/jquery.min.js
+examples/webkit/fancybrowser/jquery_rc.py
 doc/html/_static/jquery.js
 doc/html/_static/underscore.js

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-10-15 09:55:19 UTC (rev 26162)
+++ packages/pyqt5/trunk/debian/changelog	2013-10-15 14:01:38 UTC (rev 26163)
@@ -1,3 +1,11 @@
+pyqt5 (5.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Add debian/get-orig-source.sh and explain how to use it in
+    README.source; add jquery_rc.py to list of non-free files.
+  * Remove symlink to jquery in clean target.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 15 Oct 2013 17:59:27 +0400
+
 pyqt5 (5.1+dfsg-1) unstable; urgency=low
 
   [ Scott Kitterman ]

Added: packages/pyqt5/trunk/debian/get-orig-source.sh
===================================================================
--- packages/pyqt5/trunk/debian/get-orig-source.sh	                        (rev 0)
+++ packages/pyqt5/trunk/debian/get-orig-source.sh	2013-10-15 14:01:38 UTC (rev 26163)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -ex
+
+export TAR_OPTIONS='--owner root --group root --mode a+rX'
+export GZIP_OPTIONS='-9n'
+pwd=$(pwd)
+dfsg_version="$1"
+if [ -z "$dfsg_version" ]
+then
+	printf 'Usage: %s <version>\n' "$0"
+	exit 1
+fi
+upstream_version="${dfsg_version%+dfsg*}"
+cd "$(dirname "$0")/../"
+tmpdir=$(mktemp -t -d get-orig-source.XXXXXX)
+uscan --noconf --force-download --rename --download-version="$upstream_version" --destdir="$tmpdir"
+cd "$tmpdir"
+tar -xzf pyqt5_*.orig.tar.gz
+rm pyqt5_*.orig.tar.gz
+
+mv PyQt-gpl-* "pyqt5-${dfsg_version}.orig"
+
+# jquery.min.js
+rm -rf "pyqt5-${dfsg_version}.orig/doc/html/"
+rm -f "pyqt5-${dfsg_version}.orig/examples/webkit/fancybrowser/jquery.min.js"
+rm -f "pyqt5-${dfsg_version}.orig/examples/webkit/fancybrowser/jquery_rc.py"
+
+tar -czf "$pwd/pyqt5_${dfsg_version}.orig.tar.gz" "pyqt5-${dfsg_version}.orig"
+rm -rf "$tmpdir"


Property changes on: packages/pyqt5/trunk/debian/get-orig-source.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2013-10-15 09:55:19 UTC (rev 26162)
+++ packages/pyqt5/trunk/debian/rules	2013-10-15 14:01:38 UTC (rev 26163)
@@ -167,6 +167,7 @@
 	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
+	rm -f examples/webkit/fancybrowser/jquery.min.js
 	dh_clean
 
 # Must not depend on anything. This is to be called by