This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository twiggy.
commit 6214ff40771fe1b5b8e7ca150b4963dad4a4ba6c
Author: gregor herrmann <gre...@debian.org>
Date: Wed Aug 12 15:51:59 2015 +0200
revert repackging change. mk-origtargz fails too often.
Gbp-Dch: Ignore
---
debian/changelog | 3 --
debian/copyright | 11 ++++---
debian/repack.local | 4 +++
debian/repack.stub | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/watch | 5 +--
5 files changed, 102 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 69f2c74..78087db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,6 @@ twiggy (0.1024+dfsg-2) UNRELEASED; urgency=medium
[ Salvatore Bonaccorso ]
* Update Vcs-Browser URL to cgit web frontend
- [ gregor herrmann ]
- * Replace repacking framework with Files-Excluded in debian/copyright.
-
-- gregor herrmann <gre...@debian.org> Thu, 27 Feb 2014 22:43:09 +0100
twiggy (0.1024+dfsg-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 7999c68..b3ea515 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,13 +2,12 @@ Format:
http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Twiggy
Upstream-Contact: Tatsuhiko Miyagawa <miyag...@bulknews.net>
Source: https://metacpan.org/release/Twiggy
-Files-Excluded: eg/chat-websocket/static/jquery.ev.js
- eg/chat-websocket/static/jquery.oembed.js
- eg/chat-websocket/static/screen.css
-
Comment: The upstream sources were repackaged in order to remove
jquery.ev.js, jquery.oembed.js and screen.css from the
eg/chat-websocket/static/ directory due to missing license/copyright.
+ .
+ The +dfsg tarball can be created using the repack.sh script (via
+ repack.stub) and is automatically run on upgrade by uscan.
Files: *
Copyright: 2013, Tatsuhiko Miyagawa <miyag...@bulknews.net>
@@ -40,6 +39,10 @@ Files: debian/*
Copyright: 2011, Alessandro Ghedini <gh...@debian.org>
License: Artistic or GPL-1+
+Files: debian/repack.stub
+Copyright: 2009, Ryan Niebur <r...@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
new file mode 100644
index 0000000..3c6f409
--- /dev/null
+++ b/debian/repack.local
@@ -0,0 +1,4 @@
+MANIFEST=1
+rm eg/chat-websocket/static/jquery.ev.js
+rm eg/chat-websocket/static/jquery.oembed.js
+rm eg/chat-websocket/static/screen.css
diff --git a/debian/repack.stub b/debian/repack.stub
new file mode 100644
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 <r...@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 2bb6b04..b38484f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
version=3
-opts="dversionmangle=s/\+dfsg//,repacksuffix=+dfsg" \
-https://metacpan.org/release/Twiggy
.*/Twiggy-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+opts="dversionmangle=s/\+dfsg//" \
+https://metacpan.org/release/Twiggy
.*/Twiggy-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
+debian sh debian/repack.stub
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/twiggy.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
