[libnetaddr-ip-perl] 01/02: Switch repackaging framework to Files-Excluded method.

gregor herrmann gregoa at debian.org
Wed Jun 29 13:12:06 UTC 2016


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

gregoa pushed a commit to branch master
in repository libnetaddr-ip-perl.

commit 54df7e286f3a32878f56284e45fa1d3942cbfdc8
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Jun 29 15:11:42 2016 +0200

    Switch repackaging framework to Files-Excluded method.
---
 debian/copyright    |  7 ++---
 debian/repack.local |  2 --
 debian/repack.stub  | 88 -----------------------------------------------------
 debian/watch        |  4 +--
 4 files changed, 4 insertions(+), 97 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 4dc477b..69584bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: NetAddr-IP
 Upstream-Contact: Michael Robinton <michael at bizsystems.com>
 Source: https://metacpan.org/release/NetAddr-IP
+Files-Excluded: docs/rfc*
 Comment: The +dfsg version is created by removing the non-free RFC from
- the docs/ directory. debian/repack.sh automates this process.
+ the docs/ directory.
 
 Files: *
 Copyright:
@@ -35,10 +36,6 @@ Copyright:
  2014, Daniel Lintott <daniel at serverb.co.uk>
 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 a86b495..0000000
--- a/debian/repack.local
+++ /dev/null
@@ -1,2 +0,0 @@
-MANIFEST=1
-rm docs/rfc*
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 5ddeec7..0a8ff80 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg// \
-https://metacpan.org/release/NetAddr-IP .*/NetAddr-IP-v?(\d[\d.]*)\.tar\.gz debian debian/repack.stub
+opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
+https://metacpan.org/release/NetAddr-IP .*/NetAddr-IP-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/libnetaddr-ip-perl.git



More information about the Pkg-perl-cvs-commits mailing list