This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository pinto.
commit efaad7a896af522115070fdb01c3ae422bdbea17 Author: gregor herrmann <[email protected]> Date: Wed Aug 12 15:51:42 2015 +0200 revert repackging change. mk-origtargz fails too often. Gbp-Dch: Ignore --- debian/changelog | 6 ---- debian/copyright | 5 ++- debian/repack.local | 2 ++ debian/repack.stub | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/watch | 5 +-- 5 files changed, 98 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7abc06..738d6e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -pinto (0.97+dfsg-5) UNRELEASED; urgency=medium - - * Replace repacking framework with Files-Excluded in debian/copyright. - - -- gregor herrmann <[email protected]> Wed, 12 Aug 2015 14:59:39 +0200 - pinto (0.97+dfsg-4) unstable; urgency=medium * Team upload. diff --git a/debian/copyright b/debian/copyright index 65f184d..933a4ef 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Pinto Source: https://metacpan.org/release/Pinto Upstream-Contact: Jeffrey Ryan Thalhammer <[email protected]> -Files-Excluded: etc/ Comment: etc folder is removed from the upstream source, because it is incompatible with the Debian Free Software Guidelines. @@ -14,6 +13,10 @@ Files: debian/* Copyright: 2013, Oleg Gashev <[email protected]> License: Artistic or GPL-1+ +Files: debian/repack.stub +Copyright: 2009, Ryan Niebur <[email protected]> +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 new file mode 100644 index 0000000..91c81fe --- /dev/null +++ b/debian/repack.local @@ -0,0 +1,2 @@ +MANIFEST=1 +rm -rf etc diff --git a/debian/repack.stub b/debian/repack.stub new file mode 100755 index 0000000..c4d7bda --- /dev/null +++ b/debian/repack.stub @@ -0,0 +1,89 @@ +#!/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 <[email protected]> + +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 [ -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/packages/pkg-perl-tools.git;a=blob_plain;f=scripts/repack.sh;hb=HEAD"; + exit 1 +fi + +exec "$REPACK_SH" "$@" diff --git a/debian/watch b/debian/watch index 4840d3c..89f2d5d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ version=3 -opts=dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg \ -https://metacpan.org/release/Pinto .*/Pinto-v?(\d[\d.-]*)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ +opts=dversionmangle=s/\+dfsg$// \ +https://metacpan.org/release/Pinto .*/Pinto-v?(\d[\d.-]*)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \ +debian sh debian/repack.stub -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pinto.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
