[Python-modules-commits] r17527 - in packages/pyfiglet/trunk/debian (5 files)

[stefanor at users.alioth.debian.org]

    Date: Sunday, June 19, 2011 @ 11:52:18
  Author: stefanor
Revision: 17527

Revert Vcs-Browser change; Move DFSG repacking into a script called by uscan.

Added:
  packages/pyfiglet/trunk/debian/repack.sh
Modified:
  packages/pyfiglet/trunk/debian/changelog
  packages/pyfiglet/trunk/debian/control
  packages/pyfiglet/trunk/debian/rules
  packages/pyfiglet/trunk/debian/watch

Modified: packages/pyfiglet/trunk/debian/changelog
===================================================================
--- packages/pyfiglet/trunk/debian/changelog	2011-06-19 11:19:19 UTC (rev 17526)
+++ packages/pyfiglet/trunk/debian/changelog	2011-06-19 11:52:18 UTC (rev 17527)
@@ -11,7 +11,7 @@
   * Updated debian-defaults.diff.
   * Install wrapper with dh_install, as upstream has a setup.py.
   * Build-Depend on python-setuptools and clean up egg-info.
-  * Update Vcs-Browser link for alioth changes.
+  * Move DFSG repacking into a script called by uscan.
 
  -- Stefano Rivera <stefanor at debian.org>  Mon, 30 May 2011 21:05:33 +0200
 

Modified: packages/pyfiglet/trunk/debian/control
===================================================================
--- packages/pyfiglet/trunk/debian/control	2011-06-19 11:19:19 UTC (rev 17526)
+++ packages/pyfiglet/trunk/debian/control	2011-06-19 11:52:18 UTC (rev 17527)
@@ -11,7 +11,7 @@
 Standards-Version: 3.9.2
 Homepage: http://sourceforge.net/projects/pyfiglet/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyfiglet/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyfiglet/trunk/
+Vcs-Browser: http://svn.debian.org/viewvc/python-modules/packages/pyfiglet/trunk/
 
 Package: python-pyfiglet
 Architecture: all

Added: packages/pyfiglet/trunk/debian/repack.sh
===================================================================
--- packages/pyfiglet/trunk/debian/repack.sh	                        (rev 0)
+++ packages/pyfiglet/trunk/debian/repack.sh	2011-06-19 11:52:18 UTC (rev 17527)
@@ -0,0 +1,28 @@
+#!/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..."
+
+mkdir "pyfiglet-$VER+dfsg.orig"
+tar -x --exclude=pyfiglet/fonts --exclude=figfont.txt --exclude=.gitignore \
+    --strip-component=1 -C "pyfiglet-$VER+dfsg.orig" -f "$INFILE"
+GZIP=--best tar -cz --owner root --group root --mode a+rX \
+    -f "pyfiglet_$VER+dfsg.orig.tar.gz" "pyfiglet-$VER+dfsg.orig"
+rm -f "$INFILE"
+rm -rf "pyfiglet-$VER+dfsg.orig"


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

Modified: packages/pyfiglet/trunk/debian/rules
===================================================================
--- packages/pyfiglet/trunk/debian/rules	2011-06-19 11:19:19 UTC (rev 17526)
+++ packages/pyfiglet/trunk/debian/rules	2011-06-19 11:52:18 UTC (rev 17527)
@@ -2,15 +2,3 @@
 
 %:
 	dh $@ --with python2
-
-get-orig-source:
-	set -e; \
-	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p'); \
-	uscan --noconf --force-download --rename --download-version=$$VER --destdir=.; \
-	mkdir pyfiglet-$$VER+dfsg.orig; \
-	tar -x --exclude=pyfiglet/fonts --exclude=figfont.txt --exclude=.gitignore \
-	    --strip-component=1 -C pyfiglet-$$VER+dfsg.orig -f pyfiglet_$$VER.orig.tar.gz; \
-	GZIP=--best tar -cz --owner root --group root --mode a+rX \
-	    -f pyfiglet_$$VER+dfsg.orig.tar.gz pyfiglet-$$VER+dfsg.orig; \
-	rm -f pyfiglet_$$VER.orig.tar.gz; \
-	rm -rf pyfiglet-$$VER+dfsg.orig

Modified: packages/pyfiglet/trunk/debian/watch
===================================================================
--- packages/pyfiglet/trunk/debian/watch	2011-06-19 11:19:19 UTC (rev 17526)
+++ packages/pyfiglet/trunk/debian/watch	2011-06-19 11:52:18 UTC (rev 17527)
@@ -1,4 +1,5 @@
 version=3
 
 opts=dversionmangle=s/\+dfsg// \
-http://githubredir.debian.net/github/pwaller/pyfiglet/(.*).tar.gz
+http://githubredir.debian.net/github/pwaller/pyfiglet/(.*).tar.gz \
+debian debian/repack.sh