[libunicode-stringprep-perl] 01/01: Revert "revert repackging change. mk-origtargz fails too often."

[Intrigeri]

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

intrigeri pushed a commit to branch master
in repository libunicode-stringprep-perl.

commit ed4036a6c1cbb204eca208d66aec92970ca1efd5
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Jun 29 12:35:37 2016 +0000

    Revert "revert repackging change. mk-origtargz fails too often."
    
    This reverts commit c2f49fb2c2b022690cf273be854d730da9fd5963.
---
 debian/changelog    |  1 +
 debian/copyright    |  5 +--
 debian/repack.local |  2 --
 debian/repack.stub  | 88 -----------------------------------------------------
 debian/watch        |  5 ++-
 5 files changed, 6 insertions(+), 95 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37d2673..d0a68b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libunicode-stringprep-perl (1.105+dfsg-2) UNRELEASED; urgency=medium
 
   [ gregor herrmann ]
   * debian/copyright: change Copyright-Format 1.0 URL to HTTPS.
+  * Replace repacking framework with Files-Excluded in debian/copyright.
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 30 Jan 2016 20:07:18 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 7114c50..364012e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://metacpan.org/release/Unicode-Stringprep
 Upstream-Contact: Claus Färber <CFAERBER at cpan.org>
 Upstream-Name: Unicode-Stringprep
+Files-Excluded: t/nameprep*.t
 Comment: The files t/nameprep*.t have been removed from the upstream tarball,
- since it is not clear if they are DFSG-free.
- Running uscan is enough to get the repackaged tarball.
+ since it is not clear if they are DFSG-free. Running uscan is enough to get
+ the repackaged tarball.
 
 Files: *
 Copyright: 2007-2014, Claus Färber <CFAERBER at cpan.org>
diff --git a/debian/repack.local b/debian/repack.local
deleted file mode 100644
index 653d358..0000000
--- a/debian/repack.local
+++ /dev/null
@@ -1,2 +0,0 @@
-MANIFEST=1
-rm t/nameprep*.t
diff --git a/debian/repack.stub b/debian/repack.stub
deleted file mode 100755
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 4bdb398..64d8056 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts="dversionmangle=s/\+dfsg//" \
-https://metacpan.org/release/Unicode-Stringprep   .*/Unicode-Stringprep-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
-debian sh debian/repack.stub
+opts="dversionmangle=s/\+dfsg//,repacksuffix=+dfsg" \
+https://metacpan.org/release/Unicode-Stringprep   .*/Unicode-Stringprep-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/libunicode-stringprep-perl.git