r27699 - in /trunk/liburi-perl: MANIFEST debian/README.source debian/changelog debian/control debian/repack.sh debian/rules debian/watch rfc2396.txt

kees at users.alioth.debian.org kees at users.alioth.debian.org
Thu Dec 4 07:30:54 UTC 2008 

Author: kees
Date: Thu Dec  4 07:30:51 2008
New Revision: 27699

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27699
Log:
  - Bump standards version to 3.8.0 (added Homepage, README.source).
* debian/{control,rules}:
  - Add quilt for patch management.
* debian/{watch,repack.sh,rules}: handle repacking to remove rfc2396.txt
  (non-redistributable):
  - http://rt.cpan.org/Ticket/Display.html?id=41418

Added:
    trunk/liburi-perl/debian/README.source
    trunk/liburi-perl/debian/repack.sh   (with props)
Removed:
    trunk/liburi-perl/rfc2396.txt
Modified:
    trunk/liburi-perl/MANIFEST
    trunk/liburi-perl/debian/changelog
    trunk/liburi-perl/debian/control
    trunk/liburi-perl/debian/rules
    trunk/liburi-perl/debian/watch

Modified: trunk/liburi-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/MANIFEST?rev=27699&op=diff
==============================================================================
--- trunk/liburi-perl/MANIFEST (original)
+++ trunk/liburi-perl/MANIFEST Thu Dec  4 07:30:51 2008
@@ -51,7 +51,6 @@
 URI/urn.pm
 URI/urn/isbn.pm
 URI/urn/oid.pm
-rfc2396.txt
 t/abs.t
 t/clone.t
 t/cwd.t

Added: trunk/liburi-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/debian/README.source?rev=27699&op=file
==============================================================================
--- trunk/liburi-perl/debian/README.source (added)
+++ trunk/liburi-perl/debian/README.source Thu Dec  4 07:30:51 2008
@@ -1,0 +1,12 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+~~~~~
+
+The original tarball is repackaged, in order to remove the shipped debian/
+directory and the references to in in MANIFEST. To ease the creation of a
+new tarball debian/repack.sh can be used, which is also called by
+debian/rules' get-orig-source target.

Modified: trunk/liburi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/debian/changelog?rev=27699&op=diff
==============================================================================
--- trunk/liburi-perl/debian/changelog (original)
+++ trunk/liburi-perl/debian/changelog Thu Dec  4 07:30:51 2008
@@ -1,12 +1,16 @@
 liburi-perl (1.37+dfsg-1) UNRELEASED; urgency=low
 
-  * (NEEDS TO DROP non-dfsg rfc from orig.tar.gz)
   * (NOT RELEASED YET) New upstream release (Closes: #507286).
   * debian/control:
     - Take over for the Debian Perl Group, with permission from Stefan
       Hornburg.
     - Clean up long description (Closes: #433968).
-    - Bump standards version to 3.8.0 (added Homepage).
+    - Bump standards version to 3.8.0 (added Homepage, README.source).
+  * debian/{control,rules}:
+    - Add quilt for patch management.
+  * debian/{watch,repack.sh,rules}: handle repacking to remove rfc2396.txt
+    (non-redistributable):
+    - http://rt.cpan.org/Ticket/Display.html?id=41418
 
  -- Kees Cook <kees at outflux.net>  Wed, 03 Dec 2008 22:51:28 -0800
 

Modified: trunk/liburi-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/debian/control?rev=27699&op=diff
==============================================================================
--- trunk/liburi-perl/debian/control (original)
+++ trunk/liburi-perl/debian/control Thu Dec  4 07:30:51 2008
@@ -1,8 +1,8 @@
 Source: liburi-perl
 Section: perl
 Priority: optional
+Build-Depends: debhelper (>= 5), quilt
 Build-Depends-Indep: perl (>= 5.6.0-16)
-Build-Depends: debhelper (>= 5)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Hornburg (Racke) <racke at linuxia.de>,
  Kees Cook <kees at outflux.net>, Rene Mayorga <rmayorga at debian.org.sv>

Added: trunk/liburi-perl/debian/repack.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/debian/repack.sh?rev=27699&op=file
==============================================================================
--- trunk/liburi-perl/debian/repack.sh (added)
+++ trunk/liburi-perl/debian/repack.sh Thu Dec  4 07:30:51 2008
@@ -1,0 +1,44 @@
+#!/bin/sh
+# Repackage upstream source to exclude non-distributable files
+# should be called as "repack sh --upstream-source <ver> <downloaded file>
+# (for example, via uscan)
+
+set -e
+set -u
+
+VER="$2"
+FILE="$3"
+DVER="${VER}+dfsg"
+PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
+
+printf "\nRepackaging $FILE\n"
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+trap "rm -rf $DIR" QUIT INT EXIT
+
+tar xzf $FILE -C $DIR
+
+REPACK=`basename $FILE`
+
+UP_DIR=`ls -1 $DIR`
+
+(
+    set -e
+    set -u
+
+    cd $DIR
+
+    rm -v $UP_DIR/rfc2396.txt
+
+    sed -i '\,rfc2396.txt, D' $UP_DIR/MANIFEST
+
+    REPACK_DIR="$PKG-$VER.orig"
+    mv $UP_DIR $REPACK_DIR
+    tar -c $REPACK_DIR | gzip -9 > $REPACK
+)
+
+mv $DIR/$REPACK $FILE
+
+echo "*** $FILE repackaged"
+
+prename --verbose --force "s/$VER/$DVER/" $FILE

Propchange: trunk/liburi-perl/debian/repack.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/liburi-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/debian/rules?rev=27699&op=diff
==============================================================================
--- trunk/liburi-perl/debian/rules (original)
+++ trunk/liburi-perl/debian/rules Thu Dec  4 07:30:51 2008
@@ -10,13 +10,17 @@
 PERL = /usr/bin/perl
 endif
 
+include /usr/share/quilt/quilt.make
+
 TMP     =`pwd`/debian/liburi-perl
 archlib =`$(PERL) -MConfig -e 'print $$Config{installarchlib}'`
 config  =INSTALLDIRS=perl INSTALLMAN1DIR=$(TMP)/usr/share/man/man1 INSTALLMAN3DIR=$(TMP)/usr/share/man/man3 INSTALLPRIVLIB=$(TMP)/usr/lib/perl5 INSTALLARCHLIB=$(TMP)$(archlib) INSTALLBIN=$(TMP)/usr/bin INSTALLSCRIPT=$(TMP)/usr/bin
 
+get-orig-source:
+	uscan --verbose --force-download
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 # Add here commands to compile the package.
@@ -25,7 +29,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	-rm -f build-stamp install-stamp

Modified: trunk/liburi-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/debian/watch?rev=27699&op=diff
==============================================================================
--- trunk/liburi-perl/debian/watch (original)
+++ trunk/liburi-perl/debian/watch Thu Dec  4 07:30:51 2008
@@ -1,2 +1,4 @@
 version=3
-http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-(.*)\.tar\.gz
+opts=dversionmangle=s/\+dfsg// \
+    http://search.cpan.org/dist/URI/ .*/URI-v?(\d[\d_.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
+    debian sh debian/repack.sh

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