r59509 - in /trunk/jifty/debian: changelog copyright repack.local repack.stub watch

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Fri Jun 18 13:23:40 UTC 2010


Author: gregoa
Date: Fri Jun 18 13:23:20 2010
New Revision: 59509

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59509
Log:
Repack the upstream tarball: remove non-free share/web/static/js/json.js.

Added:
    trunk/jifty/debian/repack.local
    trunk/jifty/debian/repack.stub   (with props)
Modified:
    trunk/jifty/debian/changelog
    trunk/jifty/debian/copyright
    trunk/jifty/debian/watch

Modified: trunk/jifty/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/changelog?rev=59509&op=diff
==============================================================================
--- trunk/jifty/debian/changelog (original)
+++ trunk/jifty/debian/changelog Fri Jun 18 13:23:20 2010
@@ -1,3 +1,9 @@
+jifty (0.91117-3) UNRELEASED; urgency=low
+
+  * Repack the upstream tarball: remove non-free share/web/static/js/json.js.
+
+ -- gregor herrmann <gregoa at debian.org>  Fri, 18 Jun 2010 15:22:26 +0200
+
 jifty (0.91117-2) unstable; urgency=low
 
   * debian/rules: fix bashism, thanks to Raphael Geissert for the bug report

Modified: trunk/jifty/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/copyright?rev=59509&op=diff
==============================================================================
--- trunk/jifty/debian/copyright (original)
+++ trunk/jifty/debian/copyright Fri Jun 18 13:23:20 2010
@@ -2,6 +2,8 @@
 Maintainer: Jesse Vincent, Alex Vandiver and David Glasser.
 Source: http://search.cpan.org/dist/Jifty/
 Name: Jifty
+X-Comment: the +dfsg version is produced by removing the non-free
+ share/web/static/js/json.js
 
 Files: *
 Copyright: Copyright 2005-2009 Best Practical Solutions, LLC. 
@@ -61,26 +63,6 @@
  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: */share/web/static/js/json.js
-Copyright: Copyright (c) 2005 JSON.org
-License: MIT-like
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The Software shall be used for Good, not Evil.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
 
 Files: */share/web/static/js/jquery-1.2.1.js  	 
 Copyright: Copyright (c) 2007 John Resig (jquery.com) 	 

Added: trunk/jifty/debian/repack.local
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/repack.local?rev=59509&op=file
==============================================================================
--- trunk/jifty/debian/repack.local (added)
+++ trunk/jifty/debian/repack.local Fri Jun 18 13:23:20 2010
@@ -1,0 +1,2 @@
+MANIFEST=1
+rm share/web/static/js/json.js

Added: trunk/jifty/debian/repack.stub
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/repack.stub?rev=59509&op=file
==============================================================================
--- trunk/jifty/debian/repack.stub (added)
+++ trunk/jifty/debian/repack.stub Fri Jun 18 13:23:20 2010
@@ -1,0 +1,82 @@
+#!/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
+sources 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
+
+=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://svn.debian.org/viewsvn/pkg-perl/scripts/repack.sh"
+    exit 1
+fi
+
+exec "$REPACK_SH" "$@"

Propchange: trunk/jifty/debian/repack.stub
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/jifty/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/watch?rev=59509&op=diff
==============================================================================
--- trunk/jifty/debian/watch (original)
+++ trunk/jifty/debian/watch Fri Jun 18 13:23:20 2010
@@ -1,4 +1,5 @@
-# format version number, currently 3; this line is compulsory!
 version=3
-# URL to the package page followed by a regex to search
-http://search.cpan.org/dist/Jifty/   .*/Jifty-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+opts=dversionmangle=s/\+dfsg// \
+	http://search.cpan.org/dist/Jifty/   .*/Jifty-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
+	debian sh debian/repack.stub
+




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