r61861 - in /trunk/libxml-sax-writer-perl: debian/ debian/patches/ lib/XML/SAX/ lib/XML/SAX/Writer/

periapt-guest at users.alioth.debian.org periapt-guest at users.alioth.debian.org
Sun Aug 22 13:20:28 UTC 2010 

Author: periapt-guest
Date: Sun Aug 22 13:19:29 2010
New Revision: 61861

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61861
Log:
sorting out patches

Added:
    trunk/libxml-sax-writer-perl/debian/patches/combined_pod_fixes.patch
Removed:
    trunk/libxml-sax-writer-perl/debian/patches/convert_errors.patch
    trunk/libxml-sax-writer-perl/debian/patches/fix_pod.patch
Modified:
    trunk/libxml-sax-writer-perl/debian/changelog
    trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.patch
    trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.patch
    trunk/libxml-sax-writer-perl/debian/patches/series
    trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer.pm
    trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer/XML.pm

Modified: trunk/libxml-sax-writer-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/changelog?rev=61861&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/changelog (original)
+++ trunk/libxml-sax-writer-perl/debian/changelog Sun Aug 22 13:19:29 2010
@@ -6,7 +6,6 @@
     http://pkg-perl.alioth.debian.org/howto/quilt.html#tips_and_tricks
   - all patches could have improved headers according to DEP3
     (scripts/patchedit helps)
-  - properly indent changelog entries
 
   [ gregor herrmann ]
   * Remove Florian Ragwitz from Uploaders (closes: #523278).
@@ -23,10 +22,11 @@
   * New upstream version
   * Updated control: standards, Uploaders and dependencies
   * Added source/format, removed README.source, simplified
-  dependencies and modernized rules as quilt is now standard.
+    dependencies and modernized rules as quilt is now standard.
   * Updated copyright
   * Removed fix_05basic patch as it is no longer required.
   * Removed consumer_newline.patch as it is no longer required.
+  * Reviewed remining patches.
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Mon, 16 Aug 2010 00:39:15 +0100
 

Added: trunk/libxml-sax-writer-perl/debian/patches/combined_pod_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/debian/patches/combined_pod_fixes.patch?rev=61861&op=file
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/combined_pod_fixes.patch (added)
+++ trunk/libxml-sax-writer-perl/debian/patches/combined_pod_fixes.patch Sun Aug 22 13:19:29 2010
@@ -1,0 +1,107 @@
+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 &apos; 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

Modified: 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=61861&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.patch (original)
+++ trunk/libxml-sax-writer-perl/debian/patches/file_consumer_encoding.patch Sun Aug 22 13:19:29 2010
@@ -1,11 +1,14 @@
+Subject: Defensive to encoding of output in FileConsumer
+ * Add '>:encoding(EncodeTo)' line discipline to FileConsumer to defeat 
+ perl's automatic charset conversion.
 Author: Florian Ragwitz <rafl at debian.org>
-Description: Add '>:encoding(EncodeTo)' line discipline to FileConsumer to defeat 
-perl's automatic charset conversion.
-Index: libxml-sax-writer-perl/lib/XML/SAX/Writer.pm
-===================================================================
---- libxml-sax-writer-perl.orig/lib/XML/SAX/Writer.pm	2009-02-25 23:04:43.000000000 +0000
-+++ libxml-sax-writer-perl/lib/XML/SAX/Writer.pm	2009-02-25 23:08:16.000000000 +0000
-@@ -334,7 +334,10 @@
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593932
+Forwarded: no
+Last-Update: 2010-08-22
+--- a/lib/XML/SAX/Writer.pm
++++ b/lib/XML/SAX/Writer.pm
+@@ -330,7 +330,10 @@
  # new
  #-------------------------------------------------------------------#
  sub new {
@@ -17,7 +20,7 @@
  
      XML::SAX::Writer::Exception->throw(
          Message => "No filename provided to " . ref( $proto || $proto )
-@@ -342,9 +345,10 @@
+@@ -338,9 +341,10 @@
  
      local *XFH;
  

Modified: 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=61861&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.patch (original)
+++ trunk/libxml-sax-writer-perl/debian/patches/quote_xml_version.patch Sun Aug 22 13:19:29 2010
@@ -1,8 +1,9 @@
 Subject: use double quotes in xml declarations
 Author: Florian Ragwitz <rafl at debian.org>
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593932
 Forwarded: no
-Last-Update: 2010-08-17
+Last-Update: 2010-08-22
 --- a/lib/XML/SAX/Writer/XML.pm
 +++ b/lib/XML/SAX/Writer/XML.pm
 @@ -481,14 +481,14 @@

Modified: 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=61861&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/debian/patches/series (original)
+++ trunk/libxml-sax-writer-perl/debian/patches/series Sun Aug 22 13:19:29 2010
@@ -1,4 +1,3 @@
 quote_xml_version.patch
-convert_errors.patch
+combined_pod_fixes.patch
 file_consumer_encoding.patch
-fix_pod.patch

Modified: trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer.pm?rev=61861&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer.pm (original)
+++ trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer.pm Sun Aug 22 13:19:29 2010
@@ -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
 
-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
@@ -460,7 +460,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 &apos; escape used for
 apostrophes so that you should be careful when outputting XHTML.
@@ -482,7 +482,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.
 
 =item -- QuoteCharacter
@@ -588,9 +588,10 @@
 =head1 THE ENCODER INTERFACE
 
 Encoders can be plugged in to allow one to use one's favourite encoder
-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
+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
 
 =over 4
 
@@ -603,11 +604,6 @@
 Converts that string and returns it.
 
 =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
 

Modified: trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer/XML.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer/XML.pm?rev=61861&op=diff
==============================================================================
--- trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer/XML.pm (original)
+++ trunk/libxml-sax-writer-perl/lib/XML/SAX/Writer/XML.pm Sun Aug 22 13:19:29 2010
@@ -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 .= "?>\n";
+            $xd .= " standalone='$data->{Standalone}'";
+        }
+        $xd .= '?>';
     }
 
     #$xd = $self->{Encoder}->convert($xd); # this may blow up

More information about the Pkg-perl-cvs-commits mailing list