r65949 - in /trunk/libimager-perl: FT2/fontfiles/MMOne.pfb adobe.txt debian/changelog debian/copyright debian/repack.local debian/repack.stub debian/watch

periapt-guest at users.alioth.debian.org periapt-guest at users.alioth.debian.org
Sat Dec 18 14:54:53 UTC 2010 

Author: periapt-guest
Date: Sat Dec 18 14:54:26 2010
New Revision: 65949

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65949
Log:
Repacking to avoid file with slightly restricted adobe copyright

Added:
    trunk/libimager-perl/debian/repack.local
    trunk/libimager-perl/debian/repack.stub   (with props)
Removed:
    trunk/libimager-perl/FT2/fontfiles/MMOne.pfb
    trunk/libimager-perl/adobe.txt
Modified:
    trunk/libimager-perl/debian/changelog
    trunk/libimager-perl/debian/copyright
    trunk/libimager-perl/debian/watch

Modified: trunk/libimager-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/debian/changelog?rev=65949&op=diff
==============================================================================
--- trunk/libimager-perl/debian/changelog (original)
+++ trunk/libimager-perl/debian/changelog Sat Dec 18 14:54:26 2010
@@ -9,6 +9,7 @@
   * Added myself to Uploaders 
   * Refreshed copyright (ongoing)
   * New upstream release
+  * Repacking to avoid file with slightly restricted adobe copyright
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Tue, 14 Dec 2010 11:58:56 +0000
 

Modified: trunk/libimager-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/debian/copyright?rev=65949&op=diff
==============================================================================
--- trunk/libimager-perl/debian/copyright (original)
+++ trunk/libimager-perl/debian/copyright Sat Dec 18 14:54:26 2010
@@ -4,63 +4,11 @@
 Name: Imager
 
 Files: *
-Copyright:
- 1999-2004, Arnar M. Hrafnkelsson
- 2004-2009, Tony Cook <tony at imager.perl.org>
-License: Artistic or GPL-1+
-
-Files: ppport.h
-Copyright:
- 2004-2005, Marcus Holland-Moritz <mhx-cpan at gmx.net>
- 2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
- 1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
-License: Artistic or GPL-1+
-
-Files: lib/Imager/Color/Table.pm
-Copyright: 2004, X Consortium
-License: other
- 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 above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- 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
- X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of the X Consortium shall not
- be used in advertising or otherwise to promote the sale, use or other deal-
- ings in this Software without prior written authorization from the X Consor-
- tium.
- .
- X Window System is a trademark of X Consortium, Inc.
-
-Files: scale.im
-Copyright: 1989, 1991, by Jef Poskanzer
-License: other
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted, provided
- that the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation.  This software is provided "as is" without express or
- implied warranty.
-
-Files: inc/Devel/CheckLib.pm
-Copyright: 2007, David Cantrell
- Portions Copyright 2007, David Golden
+Copyright: Tony Cook <tony at imager.perl.org>, Arnar M. Hrafnkelsson
 License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright:
- 2004-2007, Jay Bonci <jaybonci at debian.org>
+Copyright: 2004, 2005, 2006, 2007, Jay Bonci <jaybonci at debian.org>
  2004, Michael K. Edwards <medwards-debian at sane.net>
  2004, Steve Langasek <vorlon at debian.org>
  2007, Gunnar Wolf <gwolf at debian.org>
@@ -68,7 +16,8 @@
  2008, Damyan Ivanov <dmn at debian.org>
  2008, Rene Mayorga <rmayorga at debian.org.sv>
  2008, Roberto C. Sanchez <roberto at debian.org>
- 2009-2010, Jonathan Yu <frequency at cpan.org>
+ 2008, gregor herrmann <gregor+debian at comodo.priv.at>
+ 2009, Jonathan Yu <jawnsy at cpan.org>
  2009, Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
  2010, Chris Butler <chrisb at debian.org>
  2010, Nicholas Bamber <nicholas at periapt.co.uk>

Added: trunk/libimager-perl/debian/repack.local
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/debian/repack.local?rev=65949&op=file
==============================================================================
--- trunk/libimager-perl/debian/repack.local (added)
+++ trunk/libimager-perl/debian/repack.local Sat Dec 18 14:54:26 2010
@@ -1,0 +1,3 @@
+MANIFEST=1
+rm FT2/fontfiles/MMOne.pfb
+rm adobe.txt

Added: trunk/libimager-perl/debian/repack.stub
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/debian/repack.stub?rev=65949&op=file
==============================================================================
--- trunk/libimager-perl/debian/repack.stub (added)
+++ trunk/libimager-perl/debian/repack.stub Sat Dec 18 14:54:26 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/libimager-perl/debian/repack.stub
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/libimager-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimager-perl/debian/watch?rev=65949&op=diff
==============================================================================
--- trunk/libimager-perl/debian/watch (original)
+++ trunk/libimager-perl/debian/watch Sat Dec 18 14:54:26 2010
@@ -1,2 +1,3 @@
 version=3
-http://search.cpan.org/dist/Imager/ .*/Imager-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)
+opts=dversionmangle=s/\+dfsg// \
+http://search.cpan.org/dist/Imager/ .*/Imager-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip) debian debian/repack.stub

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