[Python-modules-commits] r17569 - in packages/pyamf/trunk/debian (7 files)

nomadium-guest at users.alioth.debian.org nomadium-guest at users.alioth.debian.org
Mon Jun 20 16:05:59 UTC 2011 

    Date: Monday, June 20, 2011 @ 16:05:58
  Author: nomadium-guest
Revision: 17569

* Remove compressed JavaScript files because they are not DFSG-compliant.

Added:
  packages/pyamf/trunk/debian/orig-tar.excludes
  packages/pyamf/trunk/debian/orig-tar.sh
Modified:
  packages/pyamf/trunk/debian/changelog
  packages/pyamf/trunk/debian/copyright
  packages/pyamf/trunk/debian/python-pyamf-doc.install
  packages/pyamf/trunk/debian/rules
  packages/pyamf/trunk/debian/watch

Modified: packages/pyamf/trunk/debian/changelog
===================================================================
--- packages/pyamf/trunk/debian/changelog	2011-06-20 06:58:46 UTC (rev 17568)
+++ packages/pyamf/trunk/debian/changelog	2011-06-20 16:05:58 UTC (rev 17569)
@@ -1,5 +1,5 @@
-pyamf (0.6.1-1) unstable; urgency=low
+pyamf (0.6.1+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #499617)
 
- -- Miguel Landaeta <miguel at miguel.cc>  Fri, 17 Jun 2011 11:54:50 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Mon, 20 Jun 2011 07:05:10 -0430

Modified: packages/pyamf/trunk/debian/copyright
===================================================================
--- packages/pyamf/trunk/debian/copyright	2011-06-20 06:58:46 UTC (rev 17568)
+++ packages/pyamf/trunk/debian/copyright	2011-06-20 16:05:58 UTC (rev 17569)
@@ -2,39 +2,34 @@
 Upstream-Name: PyAMF
 Upstream-Contact: The PyAMF Project <dev at pyamf.org>
 Source: http://pyamf.org/
+Comment: The following files were removed from upstream tarball because they
+ are compressed JavaScript, so they are not considered preferred source of
+ modification:
+  doc/tutorials/examples/actionscript/guestbook/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/bytearray/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/shared-object/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/simple/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/ohloh/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/addressbook/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/recordset/flash/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/geoip/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/shell/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/actionscript/socket/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/gateways/appengine/demo/assets/swfobject.js,
+  doc/tutorials/examples/general/authentication/flash/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/general/authentication/flash/as2/assets/swfobject.js,
+  doc/tutorials/examples/general/authentication/flash/as3/assets/swfobject.js,
+  doc/tutorials/examples/general/helloworld/flash/as1/deploy/assets/swfobject.js,
+  doc/tutorials/examples/general/helloworld/flash/as2/deploy/assets/swfobject.js,
+  doc/tutorials/examples/general/helloworld/flash/as3/deploy/assets/swfobject.js,
+  doc/tutorials/examples/general/helloworld/flex/deploy/assets/swfobject.js,
+  doc/tutorials/examples/general/helloworld/flex/remoteobject/deploy/assets/swfobject.js,
+  doc/tutorials/examples/gateways/appengine/demo/assets/mootools.js
 
 Files: *
 Copyright: © 2007-2011, The PyAMF Project <dev at pyamf.org>
 License: Expat
 
-Files: doc/tutorials/examples/actionscript/guestbook/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/bytearray/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/shared-object/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/simple/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/ohloh/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/addressbook/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/recordset/flash/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/geoip/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/shell/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/actionscript/socket/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/gateways/appengine/demo/assets/swfobject.js
- doc/tutorials/examples/general/authentication/flash/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/general/authentication/flash/as2/assets/swfobject.js
- doc/tutorials/examples/general/authentication/flash/as3/assets/swfobject.js
- doc/tutorials/examples/general/helloworld/flash/as1/deploy/assets/swfobject.js
- doc/tutorials/examples/general/helloworld/flash/as2/deploy/assets/swfobject.js
- doc/tutorials/examples/general/helloworld/flash/as3/deploy/assets/swfobject.js
- doc/tutorials/examples/general/helloworld/flex/deploy/assets/swfobject.js
- doc/tutorials/examples/general/helloworld/flex/remoteobject/deploy/assets/swfobject.js
-Copyright: © 2007-2008, Geoff Stearns,
- © 2007-2008, Michael Williams,
- © 2007-2008, Bobby van der Sluis
-License: Expat
-
-Files: doc/tutorials/examples/gateways/appengine/demo/assets/mootools.js
-Copyright: © 2006-2007, Valerio Proietti
-License: Expat
-
 Files: debian/*
 Copyright: © 2008-2009, Daniel Watkins <daniel at daniel-watkins.co.uk>,
  © 2008, Piotr Ożarowski <piotr at debian.org>,

Added: packages/pyamf/trunk/debian/orig-tar.excludes
===================================================================
--- packages/pyamf/trunk/debian/orig-tar.excludes	                        (rev 0)
+++ packages/pyamf/trunk/debian/orig-tar.excludes	2011-06-20 16:05:58 UTC (rev 17569)
@@ -0,0 +1,2 @@
+mootools.js
+swfobject.js

Added: packages/pyamf/trunk/debian/orig-tar.sh
===================================================================
--- packages/pyamf/trunk/debian/orig-tar.sh	                        (rev 0)
+++ packages/pyamf/trunk/debian/orig-tar.sh	2011-06-20 16:05:58 UTC (rev 17569)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=pyamf-$2+dfsg
+TAR=pyamf_$2+dfsg.orig.tar.gz
+
+# Repack upstream source to tar.gz and clean it
+tar zxf $3
+mv PyAMF-* $DIR
+GZIP=--best tar -cz --owner root --group root --mode a+rX -X debian/orig-tar.excludes -f $TAR $DIR
+rm -rf $DIR pyamf_$2.orig.tar.gz


Property changes on: packages/pyamf/trunk/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/pyamf/trunk/debian/python-pyamf-doc.install
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-doc.install	2011-06-20 06:58:46 UTC (rev 17568)
+++ packages/pyamf/trunk/debian/python-pyamf-doc.install	2011-06-20 16:05:58 UTC (rev 17569)
@@ -1 +1,3 @@
-doc/tutorials/examples/actionscript/shell/flex/deploy/assets/swfobject.js  usr/share/doc/python-pyamf-doc/assets
+# Installation of this file is disabled until upstream ships it as
+# uncompressed JavaScript file
+#doc/tutorials/examples/actionscript/shell/flex/deploy/assets/swfobject.js  usr/share/doc/python-pyamf-doc/assets

Modified: packages/pyamf/trunk/debian/rules
===================================================================
--- packages/pyamf/trunk/debian/rules	2011-06-20 06:58:46 UTC (rev 17568)
+++ packages/pyamf/trunk/debian/rules	2011-06-20 16:05:58 UTC (rev 17569)
@@ -26,14 +26,14 @@
 endif
 
 override_dh_link:
-	# remove redundant copies of swfobject.js
-	set -e; \
-	for js in $(shell find debian/python-pyamf-doc -name swfobject.js); do \
-		[ "$$(dirname $$js)" != "debian/python-pyamf-doc/usr/share/doc/python-pyamf-doc/assets" ] && \
-		dh_link -p python-pyamf-doc \
-			usr/share/doc/python-pyamf-doc/assets/swfobject.js \
-			`echo $$js | sed 's_^debian/python-pyamf-doc/__'` ; \
-	done
+#	# remove redundant copies of swfobject.js
+#	set -e; \
+#	for js in $(shell find debian/python-pyamf-doc -name swfobject.js); do \
+#		[ "$$(dirname $$js)" != "debian/python-pyamf-doc/usr/share/doc/python-pyamf-doc/assets" ] && \
+#		dh_link -p python-pyamf-doc \
+#			usr/share/doc/python-pyamf-doc/assets/swfobject.js \
+#			`echo $$js | sed 's_^debian/python-pyamf-doc/__'` ; \
+#	done
 	# remove bundled copies of mootools javascript library
 	set -e; \
 	for js in $(shell find debian/python-pyamf-doc -name mootools.js); do \

Modified: packages/pyamf/trunk/debian/watch
===================================================================
--- packages/pyamf/trunk/debian/watch	2011-06-20 06:58:46 UTC (rev 17568)
+++ packages/pyamf/trunk/debian/watch	2011-06-20 16:05:58 UTC (rev 17569)
@@ -1,2 +1,4 @@
 version=3
-http://pypi.python.org/packages/source/P/PyAMF/PyAMF-([\d.]+)\.tar\.gz
+opts=dversionmangle=s/\+dfsg$// \
+http://pypi.python.org/packages/source/P/PyAMF/PyAMF-([\d.]+)\.tar\.gz \
+ debian debian/orig-tar.sh

More information about the Python-modules-commits mailing list