[libxml-sax-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-sax-perl.

commit fc7635a0a739f648432f9110669beb21dc4af006
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Aug 12 15:51:24 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 5e4da57..077cc64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,9 +18,6 @@ libxml-sax-perl (0.99+dfsg-3) UNRELEASED; urgency=low
   [ Salvatore Bonaccorso ]
   * Update Vcs-Browser URL to cgit web frontend
 
-  [ gregor herrmann ]
-  * Replace repacking framework with Files-Excluded in debian/copyright.
-
  -- Salvatore Bonaccorso <carnil at debian.org>  Fri, 01 Jun 2012 20:50:49 +0200
 
 libxml-sax-perl (0.99+dfsg-2) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 52db8e6..8529e1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,11 +2,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Grant McLean, grantm at cpan.org
 Source: https://metacpan.org/release/XML-SAX/
 Upstream-Name: XML-SAX
-Files-Excluded: testfiles/xmltest.xml
 Comment:
   Upstream sources are repackaged to remove a file with non-free
   licensing/copyright:
     + testcases/xmltest.xml  (See #452872)
+  Repackaging is done via debian/repack.stub and can be replayed using either
+  "debian/rules get-orig-source" or "uscan -f".
   
 Files: *
 Copyright: Matt Sergeant, matt at sergeant.org
diff --git a/debian/repack.local b/debian/repack.local
new file mode 100644
index 0000000..8a5ba72
--- /dev/null
+++ b/debian/repack.local
@@ -0,0 +1,2 @@
+MANIFEST=1
+rm testfiles/xmltest.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/rules b/debian/rules
index 2d33f6a..d9c6ccf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,8 @@
 #!/usr/bin/make -f
-
 %:
 	dh $@
+
+get-orig-source:
+	# debian/repack.stub: delete the file testfiles/xmltest.xml
+	chmod 755 debian/repack.stub
+	uscan --rename --force
diff --git a/debian/watch b/debian/watch
index 9166330..feff7f2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-opts=dversionmangle=s/\+dfsg//,repacksuffix=+dfsg \
-https://metacpan.org/release/XML-SAX .*/XML-SAX-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+opts=dversionmangle=s/\+dfsg// \
+https://metacpan.org/release/XML-SAX .*/XML-SAX-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/libxml-sax-perl.git