r38105 - in /trunk/libhtml-lint-perl: MANIFEST debian/changelog debian/control debian/copyright debian/repack.sh debian/watch t/embed-extensions.t
antonio-guest at users.alioth.debian.org
antonio-guest at users.alioth.debian.org
Sun Jun 14 19:44:25 UTC 2009
Author: antonio-guest
Date: Sun Jun 14 19:44:20 2009
New Revision: 38105
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=38105
Log:
+ Standards-Version to 3.8.1
+ Homepage: s/::/-/
+ short description for libhtml-lint-perl is now a noun phrase
+ short description for weblint-perl: s/A //
+ long description for weblint-perl: s/This/weblint/
+ added the copyright note for repack.sh
* debian/watch:
+ removed "debian svn-upgrade"
+ added repack.sh to remove a testfile which contains a webpage we
cannot redistribute
Added:
trunk/libhtml-lint-perl/debian/repack.sh (with props)
Removed:
trunk/libhtml-lint-perl/t/embed-extensions.t
Modified:
trunk/libhtml-lint-perl/MANIFEST
trunk/libhtml-lint-perl/debian/changelog
trunk/libhtml-lint-perl/debian/control
trunk/libhtml-lint-perl/debian/copyright
trunk/libhtml-lint-perl/debian/watch
Modified: trunk/libhtml-lint-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/MANIFEST?rev=38105&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/MANIFEST (original)
+++ trunk/libhtml-lint-perl/MANIFEST Sun Jun 14 19:44:20 2009
@@ -29,7 +29,6 @@
t/elem-unclosed.t
t/elem-unknown.t
t/elem-unopened.t
-t/embed-extensions.t
t/pod.t
t/pod-coverage.t
t/random-nobr.t
Modified: trunk/libhtml-lint-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/changelog?rev=38105&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/changelog (original)
+++ trunk/libhtml-lint-perl/debian/changelog Sun Jun 14 19:44:20 2009
@@ -1,15 +1,4 @@
-libhtml-lint-perl (2.06-1) UNRELEASED; urgency=low
-
- TODO:
- * debian/watch: maybe it's just me but running svn-upgrade when I just want
- to download the upstream tarball doesn't seem like a good idea
- * debian/control:
- - S-V 3.8.1
- - Homepage: s/::/-/
- - short description for libhtml-lint-perl is not a noun phrase
- - short description for weblint-perl: s/A //
- - long description for weblint-perl: s/This/weblint/
- * t/embed-extensions.t contains what looks like a "real" webpage - license?!
+libhtml-lint-perl (2.06+dfsg-1) unstable; urgency=low
[ Antonio Radici ]
* New upstream release
@@ -17,10 +6,19 @@
* debian/control:
+ adding me to the Uploaders
+ debhelper compatibility bumped to 7
- + Standards-Version to 3.8.0
+ + Standards-Version to 3.8.1
+ moved all deps except debhelper and cdbs to B-D-I
+ + Homepage: s/::/-/
+ + short description for libhtml-lint-perl is now a noun phrase
+ + short description for weblint-perl: s/A //
+ + long description for weblint-perl: s/This/weblint/
* debian/copyright:
+ switched to the new format
+ + added the copyright note for repack.sh
+ * debian/watch:
+ + removed "debian svn-upgrade"
+ + added repack.sh to remove a testfile which contains a webpage we
+ cannot redistribute
[ gregor herrmann ]
* debian/watch: use dist-based URL.
@@ -30,7 +28,7 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- Antonio Radici <antonio at dyne.org> Wed, 04 Mar 2009 23:55:57 +0000
+ -- Antonio Radici <antonio at dyne.org> Sun, 14 Jun 2009 20:28:10 +0100
libhtml-lint-perl (2.04-2) unstable; urgency=medium
Modified: trunk/libhtml-lint-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/control?rev=38105&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/control (original)
+++ trunk/libhtml-lint-perl/debian/control Sun Jun 14 19:44:20 2009
@@ -5,16 +5,16 @@
Build-Depends-Indep: devscripts (>= 2.10.7), perl (>= 5.6.0-16), libhtml-parser-perl (>= 3.20), libhtml-tagset-perl (>= 3.03), libtest-pod-perl (>= 0.95), libtest-pod-coverage-perl (>= 1.04), txt2man, dh-buildinfo
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <dr at jones.dk>, Antonio Radici <antonio at dyne.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-lint-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhtml-lint-perl/
-Homepage: http://search.cpan.org/dist/HTML::Lint/
+Homepage: http://search.cpan.org/dist/HTML-Lint/
Package: libhtml-lint-perl
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, libhtml-parser-perl (>= 3.20), libhtml-tagset-perl (>= 3.03)
Suggests: weblint-perl
-Description: Check for HTML errors in a string or file
+Description: checker of HTML errors in strings or files
HTML::Lint is a pure-Perl HTML parser and checker for syntactic legitmacy.
.
The "weblint" script - provided in the separate package "weblint-perl" -
@@ -31,8 +31,8 @@
Depends: ${perl:Depends}, ${misc:Depends}, libhtml-lint-perl
Conflicts: weblint
Provides: weblint
-Description: A syntax and minimal style checker for HTML
- This is a perl script which picks fluff off html pages, much in the same
+Description: syntax and minimal style checker for HTML
+ weblint is a perl script which picks fluff off html pages, much in the same
way traditional lint picks fluff off C programs.
.
The script is a complete rewrite of Neil Bowers' original weblint script.
Modified: trunk/libhtml-lint-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/copyright?rev=38105&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/copyright (original)
+++ trunk/libhtml-lint-perl/debian/copyright Sun Jun 14 19:44:20 2009
@@ -3,6 +3,15 @@
Upstream-Maintainer: Andy Lester <andy at petdance.com>
Upstream-Source: http://search.cpan.org/dist/HTML-Lint/
Upstream-Name: HTML-Lint
+
+X-Repackaging-Reasoning:
+ Upstream sources are repackaged to remove a file which contains a webpage
+ that cannot be redistributed
+ + t/embed-extensions.t
+ Additionally, MANIFEST is trimmed from references to this file.
+ .
+ Repackaging is done via debian/repack.sh and can be replayed using "uscan -f"
+
Files: *
Copyright: 2003, Andy Lester <andy at petdance.com>
@@ -13,6 +22,10 @@
Copyright:
(c) 2003-2008, Jonas Smedegaard <dr at jones.dk>
(c) 2009, Antonio Radici <antonio at dyne.org>
+License: Artistic | GPL-1+
+
+Files: debian/repack.sh
+Copyright: 2008, Damyan Ivanov <dmn at debian.org>
License: Artistic | GPL-1+
License: Artistic
Added: trunk/libhtml-lint-perl/debian/repack.sh
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/repack.sh?rev=38105&op=file
==============================================================================
--- trunk/libhtml-lint-perl/debian/repack.sh (added)
+++ trunk/libhtml-lint-perl/debian/repack.sh Sun Jun 14 19:44:20 2009
@@ -1,0 +1,49 @@
+#!/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 this test, it contains an embedded webpage which cannot
+# be redistributed
+rm $UP_BASE/t/embed-extensions.t
+
+# and drop the reference to it from the MANIFEST
+sed -i '\,t/embed-extensions.t, D' $UP_BASE/MANIFEST
+
+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/libhtml-lint-perl/debian/repack.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/libhtml-lint-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-lint-perl/debian/watch?rev=38105&op=diff
==============================================================================
--- trunk/libhtml-lint-perl/debian/watch (original)
+++ trunk/libhtml-lint-perl/debian/watch Sun Jun 14 19:44:20 2009
@@ -1,3 +1,6 @@
# Run the "uscan" command to check for upstream updates and more.
version=3
-http://search.cpan.org/dist/HTML-Lint/ .*/HTML-Lint-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip) debian svn-upgrade
+opts="dversionmangle=s/\+dfsg//" \
+http://search.cpan.org/dist/HTML-Lint/ \
+.*/HTML-Lint-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ \
+debian sh debian/repack.sh
More information about the Pkg-perl-cvs-commits
mailing list