[Python-modules-commits] r23293 - in packages/pyfiglet/trunk/debian (9 files)

Sat Jan 12 15:43:46 UTC 2013

Date: Saturday, January 12, 2013 @ 15:43:42
  Author: stefanor
Revision: 23293

* New upstream release.
  - Includes manpage, drop our man page.
* Bump Standards-Version to 3.9.4.
  - Bump debhelper Depends to 8.1 for build-{arch,indep} support.
* Bump machine readable copyright format to 1.0.
* Bump copyright years.
* Moved repack.sh into a get-packaged-orig-source rule in rules.

Modified:
  packages/pyfiglet/trunk/debian/changelog
  packages/pyfiglet/trunk/debian/control
  packages/pyfiglet/trunk/debian/copyright
  packages/pyfiglet/trunk/debian/manpages
  packages/pyfiglet/trunk/debian/patches/font-location.diff
  packages/pyfiglet/trunk/debian/rules
  packages/pyfiglet/trunk/debian/watch
Deleted:
  packages/pyfiglet/trunk/debian/pyfiglet.1
  packages/pyfiglet/trunk/debian/repack.sh

Modified: packages/pyfiglet/trunk/debian/changelog
===================================================================

--- packages/pyfiglet/trunk/debian/changelog	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/changelog	2013-01-12 15:43:42 UTC (rev 23293)
@@ -1,6 +1,13 @@
-pyfiglet (0.6+dfsg-2) UNRELEASED; urgency=low
+pyfiglet (0.6.1+dfsg-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    - Includes manpage, drop our man page.
   * Update Homepage.
+  * Bump Standards-Version to 3.9.4.
+    - Bump debhelper Depends to 8.1 for build-{arch,indep} support.
+  * Bump machine readable copyright format to 1.0.
+  * Bump copyright years.
+  * Moved repack.sh into a get-packaged-orig-source rule in rules.
 
  -- Stefano Rivera <stefanor at debian.org>  Sat, 16 Jun 2012 20:07:16 +0100
 

Modified: packages/pyfiglet/trunk/debian/control
===================================================================
--- packages/pyfiglet/trunk/debian/control	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/control	2013-01-12 15:43:42 UTC (rev 23293)
@@ -4,11 +4,11 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefanor at debian.org>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1),
  python-all (>= 2.6.5-13~),
  python-setuptools
 X-Python-Version: >= 2.5
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: https://github.com/pwaller/pyfiglet
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyfiglet/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyfiglet/trunk

Modified: packages/pyfiglet/trunk/debian/copyright
===================================================================
--- packages/pyfiglet/trunk/debian/copyright	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/copyright	2013-01-12 15:43:42 UTC (rev 23293)
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pyfiglet
 Upstream-Contact: Peter Waller <peter.waller at gmail.com>
 Source: https://github.com/pwaller/pyfiglet
@@ -6,7 +6,7 @@
  The upstream for this package includes non-distributable items is the release
  tarball:
  * pyfiglet/fonts - a collection of figlet fonts from ftp.figlet.org
- * figfont.txt - the Figlet specification
+ * doc/figfont.txt - the Figlet specification
  Both clearly non-distributable, as described here http://bugs.debian.org/274950
  .
  Instead of the included fonts, this package can use the fonts provided by
@@ -16,12 +16,12 @@
 
 Files: *
 Copyright: 2007, Christopher Jones <cjones at gmail.com>,
-           2011, Peter Waller <peter.waller at gmail.com>,
-           2011, Stefano Rivera <stefanor at debian.org>
+           2011-2013, Peter Waller <peter.waller at gmail.com>,
+           2011-2013, Stefano Rivera <stefanor at debian.org>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2010-2011, Stefano Rivera <stefanor at debian.org>
+Copyright: 2010-2013, Stefano Rivera <stefanor at debian.org>
 License: GPL-2+
 
 License: GPL-2+

Modified: packages/pyfiglet/trunk/debian/manpages
===================================================================
--- packages/pyfiglet/trunk/debian/manpages	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/manpages	2013-01-12 15:43:42 UTC (rev 23293)
@@ -1 +1 @@
-debian/pyfiglet.1
+doc/pyfiglet.1

Modified: packages/pyfiglet/trunk/debian/patches/font-location.diff
===================================================================
--- packages/pyfiglet/trunk/debian/patches/font-location.diff	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/patches/font-location.diff	2013-01-12 15:43:42 UTC (rev 23293)
@@ -47,7 +47,7 @@
        author_email='peter.waller at gmail.com',
        url='https://github.com/pwaller/pyfiglet',
 -      packages=['pyfiglet', 'pyfiglet.fonts'],
--      package_data={'pyfiglet.fonts' : ['pyfiglet/fonts/*.flf']},
+-      package_data={'pyfiglet.fonts' : ['*.flf']},
 +      packages=['pyfiglet'],
  )
  

Deleted: packages/pyfiglet/trunk/debian/pyfiglet.1
===================================================================
--- packages/pyfiglet/trunk/debian/pyfiglet.1	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/pyfiglet.1	2013-01-12 15:43:42 UTC (rev 23293)
@@ -1,43 +0,0 @@
-.TH PYFIGLET "1" "June 2011" "pyfiglet 0.6" "User Commands"
-.SH NAME
-pyfiglet \- display text in large ASCII art fonts.
-.SH SYNOPSIS
-.B pyfiglet.py
-[\fIoptions\fR] \fItext\fR...
-.SH DESCRIPTION
-pyFIGlet is a program that creates large characters out of ordinary
-screen characters.
-It takes ASCII text (\fItext\fR) and renders it in ASCII art fonts.
-.P
-This version of pyfiglet supports FIGlet fonts \fB.flf\fR and
-the FIGlet-compatible toilet-fonts \fB.tlf\fR.
-.SH OPTIONS
-.TP
-\fB\-\-version\fR
-show program's version number and exit
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-f\fR \fIFONT\fR, \fB\-\-font\fR=\fIFONT\fR
-font to render with (default: future)
-.TP
-\fB\-D\fR \fIDIRECTION\fR, \fB\-\-direction\fR=\fIDIRECTION\fR
-set direction text will be formatted in (default:
-auto)
-.TP
-\fB\-j\fR \fISIDE\fR, \fB\-\-justify\fR=\fISIDE\fR
-set justification, defaults to print direction
-.TP
-\fB\-w\fR \fICOLS\fR, \fB\-\-width\fR=\fICOLS\fR
-set terminal width for wrapping/justification
-(default: 80)
-.TP
-\fB\-r\fR, \fB\-\-reverse\fR
-shows mirror image of output text
-.TP
-\fB\-F\fR, \fB\-\-flip\fR
-flips rendered output text over
-.SH "SEE ALSO"
-.BR toilet (1),
-.BR figlet (1)

Deleted: packages/pyfiglet/trunk/debian/repack.sh
===================================================================
--- packages/pyfiglet/trunk/debian/repack.sh	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/repack.sh	2013-01-12 15:43:42 UTC (rev 23293)
@@ -1,28 +0,0 @@
-#!/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"

Modified: packages/pyfiglet/trunk/debian/rules
===================================================================
--- packages/pyfiglet/trunk/debian/rules	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/rules	2013-01-12 15:43:42 UTC (rev 23293)
@@ -2,3 +2,15 @@
 
 %:
 	dh $@ --with python2
+
+get-packaged-orig-source:
+	set -ex; \
+	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p'); \
+	uscan --noconf --download-current-version --destdir=. --rename; \
+	mkdir pyfiglet-$$VER+dfsg.orig; \
+	tar -x --exclude=pyfiglet/fonts --exclude=doc/figfont.txt --exclude=.gitignore \
+		--strip-component=1 -C pyfiglet-$$VER+dfsg.orig -f pyfiglet_$$VER.orig.tar.gz; \
+	rm 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 -rf "pyfiglet-$$VER+dfsg.orig"

Modified: packages/pyfiglet/trunk/debian/watch
===================================================================
--- packages/pyfiglet/trunk/debian/watch	2013-01-12 14:37:57 UTC (rev 23292)
+++ packages/pyfiglet/trunk/debian/watch	2013-01-12 15:43:42 UTC (rev 23293)
@@ -2,4 +2,4 @@
 
 opts=dversionmangle=s/\+dfsg// \
 http://githubredir.debian.net/github/pwaller/pyfiglet/(.*).tar.gz \
-debian debian/repack.sh
+debian


