[libxml-sax-writer-perl] 09/12: Refresh and forward patches, drop combined_pod_fixes.patch and half_code_pod_errors.patch (applied upstream). Closes: #593932
Florian Schlichting
fsfs at moszumanska.debian.org
Fri Mar 7 20:01:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository libxml-sax-writer-perl.
commit f7d4608b6404356725561b456c96d45c6fcf35f9
Author: Florian Schlichting <fsfs at debian.org>
Date: Fri Mar 7 20:43:49 2014 +0100
Refresh and forward patches, drop combined_pod_fixes.patch and half_code_pod_errors.patch (applied upstream). Closes: #593932
---
debian/copyright | 4 --
debian/patches/combined_pod_fixes.patch | 107 ----------------------------
debian/patches/file_consumer_encoding.patch | 6 +-
debian/patches/half_code_pod_errors.patch | 28 --------
debian/patches/quote_xml_version.patch | 4 +-
debian/patches/series | 2 -
6 files changed, 5 insertions(+), 146 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index d6917de..03000ab 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,10 +19,6 @@ Copyright: 2002-2003, Ardo van Rangelrooij <ardo at debian.org>
2010, Nicholas Bamber <nicholas at periapt.co.uk>
License: Artistic or GPL-1+
-Files: debian/patches/half_code_pod_errors.patch
-Copyright: 2010, Frank Wiegand <fwie at cpan.org>
-License: Artistic or GPL-1+
-
License: Artistic
This program is free software; you can redistribute it and/or modify
it under the terms of the Artistic License, which comes with Perl.
diff --git a/debian/patches/combined_pod_fixes.patch b/debian/patches/combined_pod_fixes.patch
deleted file mode 100644
index 58a3b3e..0000000
--- a/debian/patches/combined_pod_fixes.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Subject: Fix documentation issues
- * add more documentation on encoding errors
- * Implementation moved from Text::Iconv to Encode without updating
- documentation. Also the change broke Florian's suggestion.
- * Stripped a number of stray characters of dubious encoding.
- These appear to be blank in the code, appear as 'A' in the man page,
- and 'A^' in the CPAN web page.
- * Added '*' in lest to make man page look correct
-Author: Florian Ragwitz <rafl at debian.org>
-Last-Update: 2010-08-22
-Bug: http://rt.cpan.org/Ticket/Display.html?id=60504
-Reviewed-By: Nicholas Bamber <nicholas at periapt.co.uk>
---- a/lib/XML/SAX/Writer.pm
-+++ b/lib/XML/SAX/Writer.pm
-@@ -437,16 +437,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
-+=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
-@@ -456,11 +456,11 @@
-
- If this parameter is not provided, then output is sent to STDOUT.
-
--=item -- Escape
-+=item * -- Escape
-
- 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.
-@@ -468,24 +468,24 @@
- If you only want to add entries to the Escape hash, you can first
- copy the contents of %XML::SAX::Writer::DEFAULT_ESCAPE.
-
--=item -- CommentEscape
-+=item * -- CommentEscape
-
- Comment content often needs to be escaped differently from other
- content. This option works exactly as the previous one except that
- by default it only escapes the double dash (--) and that the contents
- can be copied from %XML::SAX::Writer::COMMENT_ESCAPE.
-
--=item -- EncodeFrom
-+=item * -- EncodeFrom
-
- The character set encoding in which incoming data will be provided.
- This defaults to UTF-8, which works for US-ASCII as well.
-
--=item -- EncodeTo
-+=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.
-
--=item -- QuoteCharacter
-+=item * -- QuoteCharacter
-
- Set the character used to quote attributes. This defaults to single quotes (')
- for backwards compatiblity.
-@@ -588,10 +588,9 @@
- =head1 THE ENCODER INTERFACE
-
- Encoders can be plugged in to allow one to use one's favourite encoder
--object. Presently there are two encoders: Iconv and NullEncoder, and
--one based on C<Encode> ought to be out soon. They need to implement
--two methods, and may inherit from XML::SAX::Writer::NullConverter if
--they wish to
-+object. Presently there are two encoders: Encode and NullEncoder. They
-+need to implement two methods, and may inherit from
-+XML::SAX::Writer::NullConverter if they wish to
-
- =over 4
-
-@@ -605,6 +604,11 @@
-
- =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.
-+
- =head1 CUSTOM OUTPUT
-
- This module is generally used to write XML -- which it does most of the
diff --git a/debian/patches/file_consumer_encoding.patch b/debian/patches/file_consumer_encoding.patch
index 83cb558..3efcb8b 100644
--- a/debian/patches/file_consumer_encoding.patch
+++ b/debian/patches/file_consumer_encoding.patch
@@ -3,11 +3,11 @@ Subject: Defensive to encoding of output in FileConsumer
perl's automatic charset conversion.
Author: Florian Ragwitz <rafl at debian.org>
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Forwarded: no
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=93623
Last-Update: 2010-08-22
--- a/lib/XML/SAX/Writer.pm
+++ b/lib/XML/SAX/Writer.pm
-@@ -330,7 +330,10 @@
+@@ -327,7 +327,10 @@
# new
#-------------------------------------------------------------------#
sub new {
@@ -19,7 +19,7 @@ Last-Update: 2010-08-22
XML::SAX::Writer::Exception->throw(
Message => "No filename provided to " . ref( $proto || $proto )
-@@ -338,9 +341,10 @@
+@@ -335,9 +338,10 @@
local *XFH;
diff --git a/debian/patches/half_code_pod_errors.patch b/debian/patches/half_code_pod_errors.patch
deleted file mode 100644
index 83688d2..0000000
--- a/debian/patches/half_code_pod_errors.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Frank Wiegand <fwie at cpan.org>
-Origin: http://rt.cpan.org/Ticket/Attachment/692202/356379/diff
-Bug: http://rt.cpan.org/Ticket/Display.html?id=51618
-Subject: POD nits [ C<...> construct missing left side ]
-Last-Update: 2010-08-22
---- a/lib/XML/SAX/Writer.pm
-+++ b/lib/XML/SAX/Writer.pm
-@@ -635,17 +635,17 @@
-
- This is used to set the proper converter for character encodings. The
- default implementation should suffice but you can override it. It must
--set C<$self->{Encoder}> to an Encoder object. Subclasses *should* call
-+set C<< $self->{Encoder} >> to an Encoder object. Subclasses *should* call
- it.
-
- =item setConsumer
-
- Same as above, except that it is for the Consumer object, and that it
--must set C<$self->{Consumer}>.
-+must set C<< $self->{Consumer} >>.
-
- =item setEscaperRegex
-
--Will initialise the escaping regex C<$self->{EscaperRegex}> based on
-+Will initialise the escaping regex C<< $self->{EscaperRegex} >> based on
- what is needed.
-
- =item escape STRING
diff --git a/debian/patches/quote_xml_version.patch b/debian/patches/quote_xml_version.patch
index ba1926c..65dbdd6 100644
--- a/debian/patches/quote_xml_version.patch
+++ b/debian/patches/quote_xml_version.patch
@@ -1,11 +1,11 @@
Subject: use double quotes in xml declarations
Author: Florian Ragwitz <rafl at debian.org>
Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Forwarded: no
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=93623
Last-Update: 2010-08-22
--- a/lib/XML/SAX/Writer/XML.pm
+++ b/lib/XML/SAX/Writer/XML.pm
-@@ -481,14 +481,14 @@
+@@ -484,14 +484,14 @@
# also, there's order in the pseudo-attr
my $xd = '';
if ($data->{Version}) {
diff --git a/debian/patches/series b/debian/patches/series
index f5c9186..096b972 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
quote_xml_version.patch
-combined_pod_fixes.patch
file_consumer_encoding.patch
-half_code_pod_errors.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libxml-sax-writer-perl.git
More information about the Pkg-perl-cvs-commits
mailing list