r31267 - in /trunk/libxml-sax-perl/debian: ./ patches/
antonio-guest at users.alioth.debian.org
antonio-guest at users.alioth.debian.org
Sun Mar 1 10:29:34 UTC 2009
Author: antonio-guest
Date: Sun Mar 1 10:29:26 2009
New Revision: 31267
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31267
Log:
some renaming and other things documented
Added:
trunk/libxml-sax-perl/debian/README.Debian (props changed)
- copied unchanged from r31264, trunk/libxml-sax-perl/debian/libxml-sax-perl.README.Debian
trunk/libxml-sax-perl/debian/postinst (props changed)
- copied unchanged from r31264, trunk/libxml-sax-perl/debian/libxml-sax-perl.postinst
trunk/libxml-sax-perl/debian/postrm (props changed)
- copied unchanged from r31264, trunk/libxml-sax-perl/debian/libxml-sax-perl.postrm
trunk/libxml-sax-perl/debian/preinst (props changed)
- copied unchanged from r31264, trunk/libxml-sax-perl/debian/libxml-sax-perl.preinst
trunk/libxml-sax-perl/debian/prerm (props changed)
- copied unchanged from r31264, trunk/libxml-sax-perl/debian/libxml-sax-perl.prerm
Removed:
trunk/libxml-sax-perl/debian/libxml-sax-perl.README.Debian
trunk/libxml-sax-perl/debian/libxml-sax-perl.postinst
trunk/libxml-sax-perl/debian/libxml-sax-perl.postrm
trunk/libxml-sax-perl/debian/libxml-sax-perl.preinst
trunk/libxml-sax-perl/debian/libxml-sax-perl.prerm
Modified:
trunk/libxml-sax-perl/debian/README.source
trunk/libxml-sax-perl/debian/changelog
trunk/libxml-sax-perl/debian/control
trunk/libxml-sax-perl/debian/patches/charset-decoding
Propchange: trunk/libxml-sax-perl/debian/README.Debian
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: trunk/libxml-sax-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-perl/debian/README.source?rev=31267&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/README.source (original)
+++ trunk/libxml-sax-perl/debian/README.source Sun Mar 1 10:29:26 2009
@@ -2,4 +2,56 @@
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.
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Modified: trunk/libxml-sax-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-perl/debian/changelog?rev=31267&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/changelog (original)
+++ trunk/libxml-sax-perl/debian/changelog Sun Mar 1 10:29:26 2009
@@ -1,4 +1,12 @@
libxml-sax-perl (0.96+dfsg-1) UNRELEASED; urgency=low
+
+ [ Antonio Radici ]
+ * New upstream release
+ * debian/control:
+ + Adding me to the uploaders
+ + Standards-Version bumped to 3.8.0
+ * debian/libxml-sax-perl.([^(:?dirs)]) renamed to $1
+ * debian/README.source updated to the latest quilt one
[Franck Joncourt]
* Replace uversionmangle by dversionmangle in debian/watch.
@@ -6,16 +14,12 @@
+ This fixes the following lintian warning:
http://lintian.debian.org/tags/debian-watch-file-should-dversionmangle\
-not-uversionmangle.html
-
[ gregor herrmann ]
* Add debian/README.source to document quilt usage, as required by
Debian Policy since 3.8.0.
* debian/control: Changed: Switched Vcs-Browser field to ViewSVN
(source stanza).
* debian/control: Added: ${misc:Depends} to Depends: field.
-
- [ Antonio Radici ]
- * New upstream release.
-- Antonio Radici <antonio at dyne.org> Sun, 01 Mar 2009 01:17:39 +0000
Modified: trunk/libxml-sax-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-perl/debian/control?rev=31267&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/control (original)
+++ trunk/libxml-sax-perl/debian/control Sun Mar 1 10:29:26 2009
@@ -2,8 +2,9 @@
Section: perl
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jay Bonci <jaybonci at debian.org>, Niko Tyni <ntyni at debian.org>
-Standards-Version: 3.7.3
+Uploaders: Jay Bonci <jaybonci at debian.org>, Niko Tyni <ntyni at debian.org>,
+ Antonio Radici <antonio at dyne.org>
+Standards-Version: 3.8.0
Homepage: http://search.cpan.org/dist/XML-SAX/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-sax-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libxml-sax-perl/
Modified: trunk/libxml-sax-perl/debian/patches/charset-decoding
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-perl/debian/patches/charset-decoding?rev=31267&op=diff
==============================================================================
--- trunk/libxml-sax-perl/debian/patches/charset-decoding (original)
+++ trunk/libxml-sax-perl/debian/patches/charset-decoding Sun Mar 1 10:29:26 2009
@@ -1,67 +1,24 @@
# Fix charset decoding in the PurePerl module (#405186)
# Niko Tyni <ntyni at iki.fi> Sun, 04 Nov 2007 20:46:58 +0200
---- a/SAX/PurePerl/Productions.pm
-+++ b/SAX/PurePerl/Productions.pm
-@@ -4,7 +4,7 @@ package XML::SAX::PurePerl::Productions;
-
- use Exporter;
- @ISA = ('Exporter');
-- at EXPORT_OK = qw($S $Char $VersionNum $BaseChar $Letter $Ideographic
-+ at EXPORT_OK = qw($S $Char $VersionNum $BaseChar $Ideographic
- $Extender $Digit $CombiningChar $EncNameStart $EncNameEnd $NameChar $CharMinusDash
- $PubidChar $Any $SingleChar);
-
-@@ -36,12 +36,10 @@ if ($] < 5.006) {
-
- $Digit = qr/ [\x30-\x39] /x;
-
-- $Letter = qr/^ $BaseChar $/x;
--
+Index: libxml-sax-perl/SAX/PurePerl/Productions.pm
+===================================================================
+--- libxml-sax-perl.orig/SAX/PurePerl/Productions.pm 2009-03-01 01:17:23.000000000 +0000
++++ libxml-sax-perl/SAX/PurePerl/Productions.pm 2009-03-01 01:25:54.000000000 +0000
+@@ -39,7 +39,7 @@
# can't do this one without unicode
# $CombiningChar = qr/^$/msx;
-- $NameChar = qr/^ $BaseChar | $Digit | [._:-] | $Extender $/x;
-+ $NameChar = qr/ $BaseChar | $Digit | [._:-] | $Extender /x;
+- $NameChar = qr/^ (?: $BaseChar | $Digit | [._:-] | $Extender )+ $/x;
++ $NameChar = qr/ (?: $BaseChar | $Digit | [._:-] | $Extender )+ /x;
PERL
die $@ if $@;
}
-@@ -138,9 +136,7 @@ else {
- [\x{4E00}-\x{9FA5}\x{3007}\x{3021}-\x{3029}]
- /x;
-
-- $Letter = qr/^ $BaseChar | $Ideographic $/x;
--
-- $NameChar = qr/^ $Letter | $Digit | [._:-] | $CombiningChar | $Extender $/x;
-+ $NameChar = qr/ $BaseChar | $Ideographic | $Digit | [._:-] | $CombiningChar | $Extender /x;
- PERL
-
- die $@ if $@;
---- a/SAX/PurePerl/Reader/UnicodeExt.pm
-+++ b/SAX/PurePerl/Reader/UnicodeExt.pm
-@@ -16,7 +16,7 @@ sub switch_encoding_stream {
- }
-
- sub switch_encoding_string {
-- Encode::from_to($_[0], $_[1], "utf-8");
-+ $_[0] = Encode::decode($_[1], $_[0]);
- }
-
- 1;
---- a/SAX/PurePerl/Reader.pm
-+++ b/SAX/PurePerl/Reader.pm
-@@ -4,7 +4,7 @@ package XML::SAX::PurePerl::Reader;
-
- use strict;
- use XML::SAX::PurePerl::Reader::URI;
--use XML::SAX::PurePerl::Productions qw( $SingleChar $Letter $NameChar );
-+use XML::SAX::PurePerl::Productions qw( $SingleChar );
- use Exporter ();
-
- use vars qw(@ISA @EXPORT_OK);
---- a/SAX/PurePerl.pm
-+++ b/SAX/PurePerl.pm
-@@ -672,7 +672,7 @@ sub Name {
+Index: libxml-sax-perl/SAX/PurePerl.pm
+===================================================================
+--- libxml-sax-perl.orig/SAX/PurePerl.pm 2009-03-01 01:17:22.000000000 +0000
++++ libxml-sax-perl/SAX/PurePerl.pm 2009-03-01 01:22:57.000000000 +0000
+@@ -677,7 +677,7 @@
return unless length($name);
@@ -70,54 +27,3 @@
return $name;
}
---- a/t/14encoding.t
-+++ b/t/14encoding.t
-@@ -1,23 +1,25 @@
- use Test;
- BEGIN { $tests = 0;
-- if ($] >= 5.007002) { $tests = 7 }
-+ if ($] >= 5.007002) { $tests = 9 }
- plan tests => $tests;
- }
- if ($tests) {
- use XML::SAX::PurePerl;
--use XML::SAX::PurePerl::DebugHandler;
-
--my $handler = XML::SAX::PurePerl::DebugHandler->new();
-+my $handler = TestHandler->new(); # see below for the TestHandler class
- ok($handler);
-
- my $parser = XML::SAX::PurePerl->new(Handler => $handler);
- ok($parser);
-
- # warn("utf-16\n");
-+# verify that the first element is correctly decoded
-+$handler->{test_elements} = [ "\x{9031}\x{5831}" ];
- $parser->parse_uri("testfiles/utf-16.xml");
- ok(1);
-
- # warn("utf-16le\n");
-+$handler->{test_elements} = [ "foo" ];
- $parser->parse_uri("testfiles/utf-16le.xml");
- ok(1);
-
-@@ -33,3 +35,19 @@ ok(1);
- $parser->parse_uri("testfiles/iso8859_2.xml");
- ok(1);
- }
-+
-+package TestHandler;
-+use XML::SAX::PurePerl::DebugHandler;
-+use base qw(XML::SAX::PurePerl::DebugHandler);
-+use Test;
-+
-+sub start_element {
-+ my $self = shift;
-+ if ($self->{test_elements} and
-+ my $value = pop @{$self->{test_elements}}) {
-+ ok($_[0]->{Name}, $value);
-+ }
-+ $self->SUPER::start_element(@_);
-+}
-+
-+1;
Propchange: trunk/libxml-sax-perl/debian/postinst
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: trunk/libxml-sax-perl/debian/postrm
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: trunk/libxml-sax-perl/debian/preinst
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: trunk/libxml-sax-perl/debian/prerm
------------------------------------------------------------------------------
svn:mergeinfo =
More information about the Pkg-perl-cvs-commits
mailing list