[libxml-feed-perl] 01/01: revert repackging change. mk-origtargz fails too often.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libxml-feed-perl.

commit 82431cb81ee2a646b8848e9128aee392f33475a0
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Aug 12 15:50:02 2015 +0200

    revert repackging change. mk-origtargz fails too often.
    
    Gbp-Dch: Ignore
---
 debian/changelog    |  1 -
 debian/copyright    |  2 --
 debian/repack.local |  3 ++
 debian/repack.stub  | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 debian/watch        |  4 +--
 5 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a120dbf..74f7f8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 libxml-feed-perl (0.52+dfsg-4) UNRELEASED; urgency=medium
 
   * Add debian/upstream/metadata
-  * Replace repacking framework with Files-Excluded in debian/copyright.
 
  -- gregor herrmann <gregoa at debian.org>  Wed, 17 Jun 2015 21:57:02 +0200
 
diff --git a/debian/copyright b/debian/copyright
index d3d8e91..c58c597 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Matt Trout
 Source: https://metacpan.org/release/XML-Feed
 Upstream-Name: XML-Feed
-Files-Excluded: t/samples/category-bug.xml
- t/samples/rss10-datespaces.xml
 
 Files: *
 Copyright: 2004-2008, Six Apart <cpan at sixapart.com>
diff --git a/debian/repack.local b/debian/repack.local
new file mode 100644
index 0000000..65bbf2f
--- /dev/null
+++ b/debian/repack.local
@@ -0,0 +1,3 @@
+MANIFEST=1
+rm t/samples/category-bug.xml
+rm t/samples/rss10-datespaces.xml
diff --git a/debian/repack.stub b/debian/repack.stub
new file mode 100755
index 0000000..4d68667
--- /dev/null
+++ b/debian/repack.stub
@@ -0,0 +1,88 @@
+#!/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 8df0b2a..e11c3d6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts="dversionmangle=s/\+dfsg//,repacksuffix=+dfsg" \
-https://metacpan.org/release/XML-Feed   .*/XML-Feed-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+opts="dversionmangle=s/\+dfsg//" \
+https://metacpan.org/release/XML-Feed   .*/XML-Feed-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip) debian debian/repack.stub
 

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