r9863 - in /trunk/libxml-sax-perl: debian/ debian/patches/ testfiles/
ntyni-guest at users.alioth.debian.org
ntyni-guest at users.alioth.debian.org
Tue Nov 27 19:01:36 UTC 2007
Author: ntyni-guest
Date: Tue Nov 27 19:01:36 2007
New Revision: 9863
URL: http://svn.debian.org/wsvn/?sc=1&rev=9863
Log:
+ copyright considerations
+ skip-test-with-nonfree-file: skip tests in t/16large.t depending on
a non-free input file.
* Repackage the upstream tarball to remove the non-free
testfiles/xmltest.xml file. (Closes: #452872)
Added:
trunk/libxml-sax-perl/debian/README.Debian-source
trunk/libxml-sax-perl/debian/patches/skip-test-with-nonfree-file
trunk/libxml-sax-perl/debian/repack.pl (with props)
Removed:
trunk/libxml-sax-perl/testfiles/xmltest.xml
Modified:
trunk/libxml-sax-perl/debian/changelog
trunk/libxml-sax-perl/debian/copyright
trunk/libxml-sax-perl/debian/libxml-sax-perl.README.Debian
trunk/libxml-sax-perl/debian/patches/series
trunk/libxml-sax-perl/debian/rules
trunk/libxml-sax-perl/debian/watch
Added: trunk/libxml-sax-perl/debian/README.Debian-source
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/README.Debian-source?rev=9863&op=file
==============================================================================
--- trunk/libxml-sax-perl/debian/README.Debian-source (added)
+++ trunk/libxml-sax-perl/debian/README.Debian-source Tue Nov 27 19:01:36 2007
@@ -1,0 +1,9 @@
+Changes to upstream sources
+---------------------------
+The file testcases/xmltest.xml has been removed from the archive,
+because it is non-free. See #452872.
+
+The removal is done by debian/repack.pl, which is intended
+to run from uscan, usually by 'debian/rules get-orig-source'.
+
+-- Niko Tyni <ntyni at iki.fi> Sun, 25 Nov 2007 23:18:52 +0200
Modified: trunk/libxml-sax-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/changelog?rev=9863&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/changelog (original)
+++ trunk/libxml-sax-perl/debian/changelog Tue Nov 27 19:01:36 2007
@@ -1,7 +1,7 @@
-libxml-sax-perl (0.16-1) UNRELEASED; urgency=low
+libxml-sax-perl (0.16+dfsg-1) UNRELEASED; urgency=low
TODO:
- + copyright considerations, particularly testfiles.xml?
+ + copyright considerations
* New maintainer.
* Acknowledge NMUs. (Closes: #441473)
@@ -31,6 +31,8 @@
* Use quilt to manage debian/patches.
+ charset-decoding: Fix charset decoding in the PurePerl module (#405186)
+ parserdetails-debian: The Debian way of handling ParserDetails.ini
+ + skip-test-with-nonfree-file: skip tests in t/16large.t depending on
+ a non-free input file.
* Move update-perl-sax-parsers under debian/ in the source package, it's
Debian-specific.
* Remove an unused Debian modification: XML::SAX->load_parsers() doesn't
@@ -40,8 +42,10 @@
* Make update-perl-sax-parsers bail out with an informative error message
if there's a locally installed XML::SAX module breaking the installation.
(See #229178)
+ * Repackage the upstream tarball to remove the non-free
+ testfiles/xmltest.xml file. (Closes: #452872)
- -- Niko Tyni <ntyni at iki.fi> Sun, 25 Nov 2007 21:54:11 +0200
+ -- Niko Tyni <ntyni at iki.fi> Sun, 25 Nov 2007 23:24:39 +0200
libxml-sax-perl (0.16-0.1) unstable; urgency=low
Modified: trunk/libxml-sax-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/copyright?rev=9863&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/copyright (original)
+++ trunk/libxml-sax-perl/debian/copyright Tue Nov 27 19:01:36 2007
@@ -8,6 +8,9 @@
Kip Hampton <khampton at totalcinema.com>
Robin Berjon <robin at knowscape.com>
Grant McLean <grantm at cpan.org>
+
+Note that one non-free file has been removed from the upstream tarball.
+See #452872 and README.Debian-source.
Copyright and license:
@@ -45,10 +48,6 @@
Robin Berjon (robin at knowscape.com)
Matt Sergeant (matt at sergeant.org)
-testfiles/xmltest.xml:
- Copyright 1998-1999 by Sun Microsystems, Inc.
- All Rights Reserved.
-
Both the current version of Perl and version 5.7.2 are licensed under
your choice of the Artistic license and the GNU General Public License
version 1 or later.
Modified: trunk/libxml-sax-perl/debian/libxml-sax-perl.README.Debian
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/libxml-sax-perl.README.Debian?rev=9863&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/libxml-sax-perl.README.Debian (original)
+++ trunk/libxml-sax-perl/debian/libxml-sax-perl.README.Debian Tue Nov 27 19:01:36 2007
@@ -62,7 +62,7 @@
script. This is done by putting the appropriate invocations of this
script in the postinst and the prerm scripts of that package.
-Starting with libxml-sax-perl version 0.16-1, the
+Starting with libxml-sax-perl version 0.16+dfsg-1, the
'update-perl-sax-parsers' script supports parser-specific priorities.
The idea is that the parser with the highest priority gets to be the
default SAX parser. The bundled parser, XML::SAX::PurePerl, is not
@@ -132,7 +132,7 @@
## ----------------------------------------------------------------------
For the above to work properly the package needs to have a versioned
-dependency on 'libxml-sax-perl (>= 0.16-1)'. You can find these
+dependency on 'libxml-sax-perl (>= 0.16+dfsg-1)'. You can find these
examples in the directory '/usr/share/doc/libxml-sax-perl/examples'.
Local Parser SAX parser module registration
Modified: trunk/libxml-sax-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/patches/series?rev=9863&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/patches/series (original)
+++ trunk/libxml-sax-perl/debian/patches/series Tue Nov 27 19:01:36 2007
@@ -1,2 +1,3 @@
+skip-test-with-nonfree-file
charset-decoding
parserdetails-debian
Added: trunk/libxml-sax-perl/debian/patches/skip-test-with-nonfree-file
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/patches/skip-test-with-nonfree-file?rev=9863&op=file
==============================================================================
--- trunk/libxml-sax-perl/debian/patches/skip-test-with-nonfree-file (added)
+++ trunk/libxml-sax-perl/debian/patches/skip-test-with-nonfree-file Tue Nov 27 19:01:36 2007
@@ -1,0 +1,23 @@
+Skip a test depending on a non-free input file (testfiles/xmltest.xml).
+See #452872.
+
+--- git.orig/t/16large.t
++++ git/t/16large.t
+@@ -1,4 +1,4 @@
+-use Test;
++use Test::More;
+ BEGIN { plan tests => 3 }
+ use XML::SAX::PurePerl;
+ use XML::SAX::PurePerl::DebugHandler;
+@@ -9,8 +9,10 @@
+ my $parser = XML::SAX::PurePerl->new(Handler => $handler);
+ ok($parser);
+
++SKIP: {
++skip "Non-free test input is not present in the Debian version", 1;
+ my $time = time;
+ $parser->parse_uri("testfiles/xmltest.xml");
+ warn("parsed ", -s "testfiles/xmltest.xml", " bytes in ", time - $time, " seconds\n");
+ ok(1);
+-
++} # SKIP
Added: trunk/libxml-sax-perl/debian/repack.pl
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/repack.pl?rev=9863&op=file
==============================================================================
--- trunk/libxml-sax-perl/debian/repack.pl (added)
+++ trunk/libxml-sax-perl/debian/repack.pl Tue Nov 27 19:01:36 2007
@@ -1,0 +1,53 @@
+#!/usr/bin/perl -w
+use strict;
+use Archive::Tar;
+
+# repack the original XML::SAX tarball, removing a non-free
+# file (testfiles/xmltest.xml) and changing the directory prefix
+# as per the Debian Developer Referenc.
+#
+# Copyright 2007 Niko Tyni <ntyni at iki.fi>
+# This program is free software; you can redistribute it and/or
+# modify it under the same terms as Perl itself.
+
+# this should be called (strictly) like uscan does:
+# "repack.pl --upstream-version <ver> <downloaded file>
+
+sub usage {
+ die "Usage: $0 --upstream-version <ver> <downloaded file>\n";
+}
+
+my $arg = shift;
+my $version = shift;
+my $file = shift;
+
+usage() if
+ ($arg ne "--upstream-version"
+ or not defined $version
+ or not defined $file);
+
+$version =~ s/\+dfsg$//;
+
+my $tar = Archive::Tar->new;
+$tar->read($file) or die("read tar file $file: $!");
+
+my $found;
+for ($tar->list_files) {
+ if ($_ eq "XML-SAX-$version/testfiles/xmltest.xml") {
+ $tar->remove($_);
+ $found++;
+ next;
+ }
+ my $oldname = $_;
+ s{^(XML-SAX-$version)}{${1}.orig};
+ $tar->rename($oldname, $_);
+}
+die("Nothing removed, is testfiles/xmltest.xml gone from the distribution?")
+ if (!$found);
+
+open(OUT, "|gzip -9 --no-name > $file")
+ or die("opening the repacked tar archive failed: $!");
+$tar->write(\*OUT) or die("writing to the repacked tar archive failed: $!");
+
+print "$file repackaged succesfully.\n";
+
Propchange: trunk/libxml-sax-perl/debian/repack.pl
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/libxml-sax-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/rules?rev=9863&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/rules (original)
+++ trunk/libxml-sax-perl/debian/rules Tue Nov 27 19:01:36 2007
@@ -73,6 +73,9 @@
binary: binary-indep binary-arch
-.PHONY: clean build install binary-indep binary-arch binary
+get-orig-source:
+ # debian/repack.pl: delete the file testfiles/xmltest.xml
+ chmod 755 debian/repack.pl
+ uscan --rename --force
-## ----------------------------------------------------------------------
+.PHONY: clean build install binary-indep binary-arch binary get-orig-source
Modified: trunk/libxml-sax-perl/debian/watch
URL: http://svn.debian.org/wsvn/trunk/libxml-sax-perl/debian/watch?rev=9863&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/watch (original)
+++ trunk/libxml-sax-perl/debian/watch Tue Nov 27 19:01:36 2007
@@ -1,2 +1,4 @@
version=3
-http://search.cpan.org/dist/XML-SAX .*/XML-SAX-([0-9].*)\.tar\.gz
+opts="uversionmangle=s/(?=$)/+dfsg/" \
+ http://search.cpan.org/dist/XML-SAX .*/XML-SAX-([0-9].*)\.tar\.gz \
+ debian debian/repack.pl
More information about the Pkg-perl-cvs-commits
mailing list