[Python-modules-commits] [willow] 01/07: Remove repack script, upstream is now DFSG compliant

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository willow.

commit 4f304ae2832293fbc87073072e38a32099755bde
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Fri Sep 22 20:15:49 2017 +0100

    Remove repack script, upstream is now DFSG compliant
---
 debian/changelog    |  6 ++++
 debian/repack.local | 12 -------
 debian/repack.stub  | 91 -----------------------------------------------------
 debian/watch        |  3 +-
 4 files changed, 7 insertions(+), 105 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 850e521..1389cc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+willow (0.4+dfsg-2) UNRELEASED; urgency=medium
+
+  * Remove repack script, upstream is now DFSG compliant 
+
+ -- Christopher Hoskin <mans0954 at debian.org>  Fri, 22 Sep 2017 20:14:39 +0100
+
 willow (0.4+dfsg-1) unstable; urgency=medium
 
   * New upstream release (0.4) 
diff --git a/debian/repack.local b/debian/repack.local
deleted file mode 100644
index bccf0bb..0000000
--- a/debian/repack.local
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ ! -f /usr/bin/convert ]
-then
-	echo "This repack script requires the convert program."
-	echo "Please install the graphicsmagick-imagemagick-compat package and try again."
-	exit 1
-fi
-
-for i in `seq 2 8`; do
-convert tests/images/orientation/landscape_$i.jpg +profile "icc" tests/images/orientation/landscape_$i.jpg
-done
diff --git a/debian/repack.stub b/debian/repack.stub
deleted file mode 100644
index 26d6a9a..0000000
--- a/debian/repack.stub
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-: <<=cut
-=pod
-
-=head1 NAME
-
-repack.stub - script to repack upstream tarballs from uscan
-
-=head1 INSTRUCTIONS
-
-put this in debian/repack.stub and add "debian sh debian/repack.stub" to
-the end of the line in debian/watch. you will also need to add a version
-mangle to debian/watch.
-
-then create a debian/repack.local. this is a shell script that is
-sourced under "set -e", so be careful to check returns codes.
-
-=head1 FUNCTIONS
-
-=over 4
-
-=item rm
-
-rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item mv
-
-mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item requires_version
-
-requires_version is there for future usage for requiring certain versions of the script
-
-=back
-
-=head1 VARIABLES
-
-=over 4
-
-=item SUFFIX
-
-defaults to +dfsg
-
-what to append to the upstream version
-
-=item RM_OPTS
-
-defaults to -vrf
-
-options to pass to rm
-
-=item MANIFEST
-
-defaults to 0, set to 1 to turn on.
-
-this will manipulate MANIFEST files in CPAN tarballs.
-
-=item UP_BASE
-
-this is the directory where the upstream source is.
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2009, Ryan Niebur <ryan at debian.org>
-
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
-=cut
-
-if [ -z "$REPACK_SH" ]; then
-    if [ -x /usr/share/pkg-perl-tools/repack.sh ]; then
-        REPACK_SH='/usr/share/pkg-perl-tools/repack.sh'
-    elif [ -f ../../scripts/repack.sh ]; then
-        REPACK_SH=../../scripts/repack.sh
-    fi
-    if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
-        REPACK_SH=$(which repack.sh)
-    fi
-fi
-
-if [ ! -f "$REPACK_SH" ]; then
-    echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
-    echo "You can get it from https://anonscm.debian.org/cgit/pkg-perl/packages/pkg-perl-tools.git/plain/scripts/repack.sh"
-    exit 1
-fi
-
-exec "$REPACK_SH" "$@"
diff --git a/debian/watch b/debian/watch
index e9b6d8e..7547490 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
 # please also check http://pypi.debian.net/Willow/watch
 version=3
 opts="filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/willow-$1\.tar\.gz/,dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg" \
-  https://github.com/wagtail/Willow/tags .*/v?(\d\S+)\.tar\.gz \
-debian sh debian/repack.stub
+  https://github.com/wagtail/Willow/tags .*/v?(\d\S+)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/willow.git