r21659 - in /trunk/libxml-sax-writer-perl/debian: ./ patches/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sun Jun 15 17:19:16 UTC 2008
Author: gregoa
Date: Sun Jun 15 17:19:16 2008
New Revision: 21659
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21659
Log:
Switch patch system from dpatch to quilt.
Added:
trunk/libxml-sax-writer-perl/debian/patches/consumer_newline.patch
trunk/libxml-sax-writer-perl/debian/patches/convert_errors.patch
trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.patch
trunk/libxml-sax-writer-perl/debian/patches/fix_pod.patch
trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.patch
trunk/libxml-sax-writer-perl/debian/patches/series
Removed:
trunk/libxml-sax-writer-perl/debian/patches/00list
trunk/libxml-sax-writer-perl/debian/patches/consumer_newline.dpatch
trunk/libxml-sax-writer-perl/debian/patches/convert_errors.dpatch
trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.dpatch
trunk/libxml-sax-writer-perl/debian/patches/fix_pod.dpatch
trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.dpatch
Modified:
trunk/libxml-sax-writer-perl/debian/changelog
trunk/libxml-sax-writer-perl/debian/control
trunk/libxml-sax-writer-perl/debian/rules
Modified: trunk/libxml-sax-writer-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/changelog?rev=21659&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/changelog (original)
+++ trunk/libxml-sax-writer-perl/debian/changelog Sun Jun 15 17:19:16 2008
@@ -10,6 +10,7 @@
Uploaders.
* debian/watch: use dist-based URL.
* debian/rules: delete /usr/lib/perl5 only if it exists.
+ * Switch patch system from dpatch to quilt.
-- gregor herrmann <gregoa at debian.org> Sun, 15 Jun 2008 18:11:20 +0200
Modified: trunk/libxml-sax-writer-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/control?rev=21659&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/control (original)
+++ trunk/libxml-sax-writer-perl/debian/control Sun Jun 15 17:19:16 2008
@@ -7,7 +7,7 @@
Homepage: http://search.cpan.org/dist/XML-SAX-Writer/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-sax-writer-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/
-Build-Depends: debhelper (>= 4.1), dpatch
+Build-Depends: debhelper (>= 4.1), quilt (>= 0.40)
Build-Depends-Indep: perl (>= 5.8.2), perl-modules (>= 5.8.0-7), libtext-iconv-perl (>= 1.2), libxml-filter-buffertext-perl (>= 0.01), libxml-namespacesupport-perl (>= 0.03), libxml-sax-perl (>= 0.10)
Package: libxml-sax-writer-perl
Added: trunk/libxml-sax-writer-perl/debian/patches/consumer_newline.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/patches/consumer_newline.patch?rev=21659&op=file
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/consumer_newline.patch (added)
+++ trunk/libxml-sax-writer-perl/debian/patches/consumer_newline.patch Sun Jun 15 17:19:16 2008
@@ -1,0 +1,50 @@
+Author: Florian Ragwitz <rafl at debian.org>
+Description: trailing newline for HandleConsumer and FileConsumer
+--- libxml-sax-writer-perl.orig/t/10consumers.t
++++ libxml-sax-writer-perl/t/10consumers.t
+@@ -71,8 +71,8 @@
+ my $cnt2 = <FH2>;
+ close FH2;
+
+-ok($cnt1 eq 'FILE ONE FILE ONE', 'file content (1)');
+-ok($cnt2 eq 'FILE TWO FILE TWO', 'file content (2)');
++ok($cnt1 eq "FILE ONE FILE ONE\n", 'file content (1)');
++ok($cnt2 eq "FILE TWO FILE TWO\n", 'file content (2)');
+
+
+ ##
+--- libxml-sax-writer-perl.orig/Writer.pm
++++ libxml-sax-writer-perl/Writer.pm
+@@ -97,7 +97,7 @@
+ $ref eq 'GLOB' or
+ UNIVERSAL::isa(\$self->{Output}, 'GLOB') or
+ UNIVERSAL::isa($self->{Output}, 'IO::Handle')) {
+- $self->{Consumer} = XML::SAX::Writer::HandleConsumer->new($self->{Output});
++ $self->{Consumer} = XML::SAX::Writer::HandleConsumer->new($self->{Output}, $self);
+ }
+ elsif (not $ref) {
+ $self->{Consumer} = XML::SAX::Writer::FileConsumer->new($self->{Output});
+@@ -312,7 +312,11 @@
+ #-------------------------------------------------------------------#
+ # finalize
+ #-------------------------------------------------------------------#
+-sub finalize { return 0 }
++sub finalize {
++ my $fh = ${$_[0]};
++ print $fh "\n";
++ return 0
++}
+ #-------------------------------------------------------------------#
+
+
+@@ -347,7 +351,9 @@
+ # finalize
+ #-------------------------------------------------------------------#
+ sub finalize {
+- close ${$_[0]};
++ my $fh = ${$_[0]};
++ print $fh "\n";
++ close $fh;
+ return 0;
+ }
+ #-------------------------------------------------------------------#
Added: trunk/libxml-sax-writer-perl/debian/patches/convert_errors.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/patches/convert_errors.patch?rev=21659&op=file
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/convert_errors.patch (added)
+++ trunk/libxml-sax-writer-perl/debian/patches/convert_errors.patch Sun Jun 15 17:19:16 2008
@@ -1,0 +1,19 @@
+Author: Florian Ragwitz <rafl at debian.org>
+Description: add more documentation on encoding errors
+--- libxml-sax-writer-perl.orig/Writer.pm
++++ libxml-sax-writer-perl/Writer.pm
+@@ -580,6 +580,14 @@
+
+ =back
+
++Note that the return value of the convert method is B<not> checked. Output may
++be truncated if a character couldn't be converted correctly. To avoid problems
++the encoder should take care encoding errors itself, for example by raising an
++exception. If you use Text::Iconv as the encoder you can use the following:
++
++ my $w = XML::Sax::Writer->new;
++ $w->{Encoder}->raise_error(1);
++
+ =head1 CUSTOM OUTPUT
+
+ This module is generally used to write XML -- which it does most of the
Added: trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.patch?rev=21659&op=file
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.patch (added)
+++ trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.patch Sun Jun 15 17:19:16 2008
@@ -1,0 +1,30 @@
+Author: Florian Ragwitz <rafl at debian.org>
+Description: Add '>:encoding(EncodeTo)' line discipline to FileConsumer to defeat
+perl's automatic charset conversion.
+--- libxml-sax-writer-perl.orig/Writer.pm
++++ libxml-sax-writer-perl/Writer.pm
+@@ -331,7 +331,10 @@
+ # new
+ #-------------------------------------------------------------------#
+ sub new {
+- my ( $proto, $file ) = ( shift, shift );
++ my ( $proto, $file, $opt ) = @_;
++ my $enc_to = (defined $opt and ref $opt eq 'HASH'
++ and defined $opt->{EncodeTo}) ? $opt->{EncodeTo}
++ : 'utf-8';
+
+ XML::SAX::Writer::Exception->throw(
+ Message => "No filename provided to " . ref( $proto || $proto )
+@@ -339,9 +342,10 @@
+
+ local *XFH;
+
+- open XFH, ">$file" or XML::SAX::Writer::Exception->throw(
++ open XFH, ">:encoding($enc_to)", $file
++ or XML::SAX::Writer::Exception->throw(
+ Message => "Error opening file $file: $!"
+- );
++ );
+
+ return $proto->SUPER::new( *{XFH}{IO}, @_ );
+ }
Added: trunk/libxml-sax-writer-perl/debian/patches/fix_pod.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/patches/fix_pod.patch?rev=21659&op=file
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/fix_pod.patch (added)
+++ trunk/libxml-sax-writer-perl/debian/patches/fix_pod.patch Sun Jun 15 17:19:16 2008
@@ -1,0 +1,44 @@
+Author: Florian Ragwitz <rafl at debian.org>
+Description: Remove strange chars from pod, so pod2man produces sane output
+--- libxml-sax-writer-perl.orig/Writer.pm
++++ libxml-sax-writer-perl/Writer.pm
+@@ -421,16 +421,16 @@
+
+ =item * new(%hash)
+
+-This is the constructor for this object. It takes a number of
++This is the constructor for this object. It takes a number of
+ parameters, all of which are optional.
+
+ =item -- Output
+
+-This parameter can be one of several things. If it is a simple
++This parameter can be one of several things. If it is a simple
+ scalar, it is interpreted as a filename which will be opened for
+-writing. If it is a scalar reference, output will be appended to this
+-scalar. If it is an array reference, output will be pushed onto this
+-array as it is generated. If it is a filehandle, then output will be
++writing. If it is a scalar reference, output will be appended to this
++scalar. If it is an array reference, output will be pushed onto this
++array as it is generated. If it is a filehandle, then output will be
+ sent to this filehandle.
+
+ Finally, it is possible to pass an object for this parameter, in which
+@@ -444,7 +444,7 @@
+
+ This should be a hash reference where the keys are characters
+ sequences that should be escaped and the values are the escaped form
+-of the sequence. By default, this module will escape the ampersand
++of the sequence. By default, this module will escape the ampersand
+ (&), less than (<), greater than (>), double quote ("), and apostrophe
+ ('). Note that some browsers don't support the ' escape used for
+ apostrophes so that you should be careful when outputting XHTML.
+@@ -466,7 +466,7 @@
+
+ =item -- EncodeTo
+
+-The character set encoding in which output should be encoded. Again,
++The character set encoding in which output should be encoded. Again,
+ this defaults to UTF-8.
+
+ =back
Added: trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.patch?rev=21659&op=file
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.patch (added)
+++ trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.patch Sun Jun 15 17:19:16 2008
@@ -1,0 +1,23 @@
+Author: Florian Ragwitz <rafl at debian.org>
+Description: use double quotes in xml declarations
+--- libxml-sax-writer-perl.orig/lib/XML/SAX/Writer/XML.pm
++++ libxml-sax-writer-perl/lib/XML/SAX/Writer/XML.pm
+@@ -481,14 +481,14 @@
+ # also, there's order in the pseudo-attr
+ my $xd = '';
+ if ($data->{Version}) {
+- $xd .= "<?xml version='$data->{Version}'";
++ $xd .= "<?xml version=\"$data->{Version}\"";
+ if ($data->{Encoding}) {
+- $xd .= " encoding='$data->{Encoding}'";
++ $xd .= " encoding=\"$data->{Encoding}\"";
+ }
+ if ($data->{Standalone}) {
+- $xd .= " standalone='$data->{Standalone}'";
++ $xd .= " standalone=\"$data->{Standalone}\"";
+ }
+- $xd .= '?>';
++ $xd .= "?>\n";
+ }
+
+ #$xd = $self->{Encoder}->convert($xd); # this may blow up
Added: trunk/libxml-sax-writer-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/patches/series?rev=21659&op=file
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/series (added)
+++ trunk/libxml-sax-writer-perl/debian/patches/series Sun Jun 15 17:19:16 2008
@@ -1,0 +1,5 @@
+consumer_newline.patch
+quote_xml_version.patch
+convert_errors.patch
+file_consumer_encoding.patch
+fix_pod.patch
Modified: trunk/libxml-sax-writer-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/rules?rev=21659&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/rules (original)
+++ trunk/libxml-sax-writer-perl/debian/rules Sun Jun 15 17:19:16 2008
@@ -53,14 +53,14 @@
dh_md5sums
dh_builddeb
-patch: patch-stamp
-patch-stamp:
+patch: $(QUILT_STAMPFN)
+$(QUILT_STAMPFN):
dpatch apply-all
- touch patch-stamp
+ touch $(QUILT_STAMPFN)
unpatch:
dpatch deapply-all
- rm -rf patch-stamp
+ rm -rf $(QUILT_STAMPFN)
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
More information about the Pkg-perl-cvs-commits
mailing list