[Python-apps-commits] r7836 - in packages/beets/trunk/debian (5 files)

[stefanor at users.alioth.debian.org]

    Date: Tuesday, November 22, 2011 @ 20:18:51
  Author: stefanor
Revision: 7836

Repack to remove minified js and .DS_Store. Update debian/copyright

Added:
  packages/beets/trunk/debian/repack.sh
Modified:
  packages/beets/trunk/debian/changelog
  packages/beets/trunk/debian/copyright
  packages/beets/trunk/debian/rules
  packages/beets/trunk/debian/watch

Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog	2011-11-22 20:16:47 UTC (rev 7835)
+++ packages/beets/trunk/debian/changelog	2011-11-22 20:18:51 UTC (rev 7836)
@@ -1,5 +1,5 @@
-beets (1.0~b10-1) unstable; urgency=low
+beets (1.0~b10+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #589396)
 
- -- Stefano Rivera <stefanor at debian.org>  Tue, 22 Nov 2011 17:11:05 +0200
+ -- Stefano Rivera <stefanor at debian.org>  Tue, 22 Nov 2011 22:16:28 +0200

Modified: packages/beets/trunk/debian/copyright
===================================================================
--- packages/beets/trunk/debian/copyright	2011-11-22 20:16:47 UTC (rev 7835)
+++ packages/beets/trunk/debian/copyright	2011-11-22 20:18:51 UTC (rev 7836)
@@ -2,11 +2,28 @@
 Upstream-Name: Beets
 Upstream-Contact: Adrian Sampson <adrian at radbox.org>
 Source: http://beets.radbox.org/
+Comment: Upstream source repacked to remove minified javascript with
+ un-minified versions.
 
 Files: *
 Copyright: 2010-2011, Adrian Sampson <adrian at radbox.org>
 License: Expat
 
+Files: beetsplug/web/static/backbone.js
+       beetsplug/web/static/underscore.js
+Copyright: 2010-2011, Jeremy Ashkenas, DocumentCloud Inc.
+License: Expat
+
+Files: beetsplug/web/static/jquery.js
+Copyright: 2011, John Resig,
+           2011, The Dojo Foundation
+License: Expat or GPL-2
+ You may use any jQuery project under the terms of either the MIT License or
+ the GNU General Public License (GPL) Version 2
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'
+
 Files: debian/*
 Copyright: 2010-2011, Stefano Rivera <stefanor at debian.org>
 License: Expat

Added: packages/beets/trunk/debian/repack.sh
===================================================================
--- packages/beets/trunk/debian/repack.sh	                        (rev 0)
+++ packages/beets/trunk/debian/repack.sh	2011-11-22 20:18:51 UTC (rev 7836)
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -eu
+VER=""
+while [ $# -gt 1 ]; do
+	case "$1" in
+		"--upstream-version")
+			VER="$2"
+			shift
+			;;
+		*)
+			echo "Unknown parameter $1" >&2
+			exit 1
+			;;
+	esac
+	shift
+done
+INFILE="$1"
+shift
+
+echo "Repacking source to remove non-free files..."
+
+set -x
+PKG="beets"
+DIRNAME="$PKG-$VER+dfsg.orig"
+mkdir "$DIRNAME"
+tar -x --strip-component=1 -C "$DIRNAME" -f "$INFILE"
+cp /usr/share/javascript/backbone/backbone.js "$DIRNAME/beetsplug/web/static/backbone.js"
+cp /usr/share/javascript/jquery/jquery.js "$DIRNAME/beetsplug/web/static/jquery.js"
+cp /usr/share/javascript/underscore/underscore.js "$DIRNAME/beetsplug/web/static/underscore.js"
+find "$DIRNAME" -name '.DS_Store' -delete
+GZIP="--best" tar -cz --owner root --group root --mode a+rX \
+    -f "${PKG}_$VER+dfsg.orig.tar.gz" "$DIRNAME"
+rm -f "$INFILE"
+rm -rf "$DIRNAME"


Property changes on: packages/beets/trunk/debian/repack.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/beets/trunk/debian/rules
===================================================================
--- packages/beets/trunk/debian/rules	2011-11-22 20:16:47 UTC (rev 7835)
+++ packages/beets/trunk/debian/rules	2011-11-22 20:18:51 UTC (rev 7836)
@@ -4,7 +4,6 @@
 	dh $@ --with python2
 
 override_dh_auto_install:
-	find . -name .DS_Store -delete
 	dh_auto_install -- --install-lib=/usr/share/beets/
 	mv debian/beets/usr/bin/beet debian/beets/usr/share/beets
 	dh_link /usr/share/beets/beet /usr/bin/beet

Modified: packages/beets/trunk/debian/watch
===================================================================
--- packages/beets/trunk/debian/watch	2011-11-22 20:16:47 UTC (rev 7835)
+++ packages/beets/trunk/debian/watch	2011-11-22 20:18:51 UTC (rev 7836)
@@ -1,4 +1,5 @@
 version=3
 
-opts=uversionmangle=s/b/~b/ \
-http://code.google.com/p/beets/downloads/list .*/beets-(.*)\.tar\.gz
+opts=uversionmangle=s/b/~b/,dversionmangle=s/\+dfsg// \
+http://code.google.com/p/beets/downloads/list .*/beets-(.*)\.tar\.gz \
+debian debian/repack.sh