[twiggy] 01/01: Replace repacking framework with Files-Excluded in debian/copyright.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository twiggy.

commit 8ab8ad20b3a903d7bd80f4362f5cb57637bf282f
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Aug 12 14:30:34 2015 +0200

    Replace repacking framework with Files-Excluded in debian/copyright.
---
 debian/copyright    | 11 +++----
 debian/repack.local |  4 ---
 debian/repack.stub  | 88 -----------------------------------------------------
 debian/watch        |  5 ++-
 4 files changed, 6 insertions(+), 102 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index b3ea515..7999c68 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Twiggy
 Upstream-Contact: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
 Source: https://metacpan.org/release/Twiggy
+Files-Excluded: eg/chat-websocket/static/jquery.ev.js
+ eg/chat-websocket/static/jquery.oembed.js
+ eg/chat-websocket/static/screen.css
+
 Comment: The upstream sources were repackaged in order to remove
  jquery.ev.js, jquery.oembed.js and screen.css from the
  eg/chat-websocket/static/ directory due to missing license/copyright.
- .
- The +dfsg tarball can be created using the repack.sh script (via
- repack.stub) and is automatically run on upgrade by uscan.
 
 Files: *
 Copyright: 2013, Tatsuhiko Miyagawa <miyagawa at bulknews.net>
@@ -39,10 +40,6 @@ Files: debian/*
 Copyright: 2011, Alessandro Ghedini <ghedo at debian.org>
 License: Artistic or GPL-1+
 
-Files: debian/repack.stub
-Copyright: 2009, Ryan Niebur <ryan at debian.org>
-License: Artistic or GPL-1+
-
 License: Artistic
  This program is free software; you can redistribute it and/or modify
  it under the terms of the Artistic License, which comes with Perl.
diff --git a/debian/repack.local b/debian/repack.local
deleted file mode 100644
index 3c6f409..0000000
--- a/debian/repack.local
+++ /dev/null
@@ -1,4 +0,0 @@
-MANIFEST=1
-rm eg/chat-websocket/static/jquery.ev.js
-rm eg/chat-websocket/static/jquery.oembed.js
-rm eg/chat-websocket/static/screen.css
diff --git a/debian/repack.stub b/debian/repack.stub
deleted file mode 100644
index 4d68667..0000000
--- a/debian/repack.stub
+++ /dev/null
@@ -1,88 +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>
-
-License: Artistic or GPL-1+
-
-=cut
-
-if [ -z "$REPACK_SH" ]; then
-    if [ -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 http://anonscm.debian.org/gitweb/?p=pkg-perl/scripts.git;a=blob_plain;f=repack.sh;hb=HEAD"
-    exit 1
-fi
-
-exec "$REPACK_SH" "$@"
diff --git a/debian/watch b/debian/watch
index b38484f..2bb6b04 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts="dversionmangle=s/\+dfsg//" \
-https://metacpan.org/release/Twiggy   .*/Twiggy-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
-debian sh debian/repack.stub
\ No newline at end of file
+opts="dversionmangle=s/\+dfsg//,repacksuffix=+dfsg" \
+https://metacpan.org/release/Twiggy   .*/Twiggy-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/twiggy.git