r29841 - in /trunk/libxml-rss-libxml-perl: ./ debian/ t/data/ t/data/2.0/

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Mon Jan 19 21:35:55 UTC 2009


Author: dmn
Date: Mon Jan 19 21:35:52 2009
New Revision: 29841

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=29841
Log:
add debian/repack.sh removing test data with unclear copyright/licensing; hook it in debian/watch; add get-orig-source to debian/rules; add README.Debian-source

Added:
    trunk/libxml-rss-libxml-perl/debian/README.Debian-source
    trunk/libxml-rss-libxml-perl/debian/repack.sh   (with props)
Removed:
    trunk/libxml-rss-libxml-perl/t/data/2.0/sf-hs-with-lastBuildDate.rss
    trunk/libxml-rss-libxml-perl/t/data/2.0/sf-hs-with-pubDate.rss
    trunk/libxml-rss-libxml-perl/t/data/freshmeat.rdf
    trunk/libxml-rss-libxml-perl/t/data/merlyn1.rss
    trunk/libxml-rss-libxml-perl/t/data/rss-permalink.xml
Modified:
    trunk/libxml-rss-libxml-perl/MANIFEST
    trunk/libxml-rss-libxml-perl/debian/changelog
    trunk/libxml-rss-libxml-perl/debian/rules
    trunk/libxml-rss-libxml-perl/debian/watch

Modified: trunk/libxml-rss-libxml-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-rss-libxml-perl/MANIFEST?rev=29841&op=diff
==============================================================================
--- trunk/libxml-rss-libxml-perl/MANIFEST (original)
+++ trunk/libxml-rss-libxml-perl/MANIFEST Mon Jan 19 21:35:52 2009
@@ -41,11 +41,6 @@
 t/charset1.t
 t/data/1.0/rss1.0.exotic.rdf
 t/data/1.0/with_content.rdf
-t/data/2.0/sf-hs-with-lastBuildDate.rss
-t/data/2.0/sf-hs-with-pubDate.rss
-t/data/freshmeat.rdf
-t/data/merlyn1.rss
-t/data/rss-permalink.xml
 t/data/rss20.xml
 t/enclosures.t
 t/enclosures2.t

Added: trunk/libxml-rss-libxml-perl/debian/README.Debian-source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-rss-libxml-perl/debian/README.Debian-source?rev=29841&op=file
==============================================================================
--- trunk/libxml-rss-libxml-perl/debian/README.Debian-source (added)
+++ trunk/libxml-rss-libxml-perl/debian/README.Debian-source Mon Jan 19 21:35:52 2009
@@ -1,0 +1,15 @@
+Upstream source is repackaged to get rid of test files  with unclear
+copyright/licensing.
+
+You can recreate the repackaged .orog.tar.gz by running "uscan -f".
+
+The following files are removed:
+
+ t/data/2.0/sf-hs-with-lastBuildDate.rss
+ t/data/2.0/sf-hs-with-pubDate.rss
+ t/data/freshmeat.rdf
+ t/data/merlyn1.rss
+ t/data/rss-permalink.xml
+
+A patch is applied to the tests in t/ that depend on the above files so that
+these particular tests are skipped.

Modified: trunk/libxml-rss-libxml-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-rss-libxml-perl/debian/changelog?rev=29841&op=diff
==============================================================================
--- trunk/libxml-rss-libxml-perl/debian/changelog (original)
+++ trunk/libxml-rss-libxml-perl/debian/changelog Mon Jan 19 21:35:52 2009
@@ -1,4 +1,4 @@
-libxml-rss-libxml-perl (0.3003-1) UNRELEASED; urgency=low
+libxml-rss-libxml-perl (0.3003+dfsg.1-1) UNRELEASED; urgency=low
 
   REJECTED by ftp-masters:
   http://lists.alioth.debian.org/pipermail/pkg-perl-maintainers/2009-January/017407.html

Added: trunk/libxml-rss-libxml-perl/debian/repack.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-rss-libxml-perl/debian/repack.sh?rev=29841&op=file
==============================================================================
--- trunk/libxml-rss-libxml-perl/debian/repack.sh (added)
+++ trunk/libxml-rss-libxml-perl/debian/repack.sh Mon Jan 19 21:35:52 2009
@@ -1,0 +1,57 @@
+#!/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"
+PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
+
+REPACK_DIR="$PKG-$VER.orig" # DevRef § 6.7.8.2
+
+echo -e "\nRepackaging $FILE\n"
+
+REPACKED_ORIG=`echo $FILE | sed 's/\.orig\./+dfsg.1.orig./'`
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+trap "rm -rf \"$DIR\"" QUIT INT EXIT
+
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xzf "$FILE" -C "$UP_BASE"
+
+if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
+	# Tarball does contain a root directory
+	UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
+fi
+
+## Remove stuff
+
+# remove rfc1320.txt
+rm -v $UP_BASE/t/data/2.0/sf-hs-with-lastBuildDate.rss \
+      $UP_BASE/t/data/2.0/sf-hs-with-pubDate.rss \
+      $UP_BASE/t/data/freshmeat.rdf \
+      $UP_BASE/t/data/merlyn1.rss \
+      $UP_BASE/t/data/rss-permalink.xml
+
+# delete lines referencing removed files from MANIFEST
+sed -i '\,t/data/2.0/sf-hs-with-lastBuildDate.rss, D' $UP_BASE/MANIFEST
+sed -i '\,t/data/2.0/sf-hs-with-pubDate.rss, D' $UP_BASE/MANIFEST
+sed -i '\,t/data/freshmeat.rdf, D' $UP_BASE/MANIFEST
+sed -i '\,t/data/merlyn1.rss, D' $UP_BASE/MANIFEST
+sed -i '\,t/data/rss-permalink.xml, D' $UP_BASE/MANIFEST
+## End
+
+mv "$UP_BASE" "$DIR/$REPACK_DIR"
+
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+gzip -9 -n < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
+
+mv "$DIR/repacked.tar.gz" "$REPACKED_ORIG"
+
+echo "*** $REPACKED_ORIG ready"

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

Modified: trunk/libxml-rss-libxml-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-rss-libxml-perl/debian/rules?rev=29841&op=diff
==============================================================================
--- trunk/libxml-rss-libxml-perl/debian/rules (original)
+++ trunk/libxml-rss-libxml-perl/debian/rules Mon Jan 19 21:35:52 2009
@@ -20,4 +20,7 @@
 
 binary: binary-arch binary-indep
 
-.PHONY: binary binary-arch binary-indep install clean build
+get-orig-source:
+	uscan -f
+
+.PHONY: binary binary-arch binary-indep install clean build get-orig-source

Modified: trunk/libxml-rss-libxml-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-rss-libxml-perl/debian/watch?rev=29841&op=diff
==============================================================================
--- trunk/libxml-rss-libxml-perl/debian/watch (original)
+++ trunk/libxml-rss-libxml-perl/debian/watch Mon Jan 19 21:35:52 2009
@@ -1,4 +1,7 @@
 # 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/XML-RSS-LibXML/   .*/XML-RSS-LibXML-v?(\d[\d_.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+opts="dversionmangle=s/\+dfsg\.\d+//" \
+http://search.cpan.org/dist/XML-RSS-LibXML/ \
+.*/XML-RSS-LibXML-v?(\d[\d_.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
+debian sh debian/repack.sh




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