r54822 - in /trunk/libxml-treebuilder-perl/debian: changelog patches/XML-TreeBuilder-NoExpand.patch

[dottedmag-guest at users.alioth.debian.org]

Author: dottedmag-guest
Date: Sun Mar 28 08:42:29 2010
New Revision: 54822

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54822
Log:
Add back DEP3 patch headers and refresh patch

Modified:
    trunk/libxml-treebuilder-perl/debian/changelog
    trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch

Modified: trunk/libxml-treebuilder-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-treebuilder-perl/debian/changelog?rev=54822&op=diff
==============================================================================
--- trunk/libxml-treebuilder-perl/debian/changelog (original)
+++ trunk/libxml-treebuilder-perl/debian/changelog Sun Mar 28 08:42:29 2010
@@ -2,9 +2,6 @@
 
   TODO:
   - update d/copyright formatting (and years for debian/)
-  - patch: add back (DEP3) headers and refresh with quilt settings from
-    http://pkg-perl.alioth.debian.org/howto/quilt.html#tips_and_tricks
-  (three of these issues are also caught by lintian)
 
   * Patch fixing https://rt.cpan.org/Public/Bug/Display.html?id=50060 was
     updated from the CPAN bugtracker.

Modified: trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch?rev=54822&op=diff
==============================================================================
--- trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch (original)
+++ trunk/libxml-treebuilder-perl/debian/patches/XML-TreeBuilder-NoExpand.patch Sun Mar 28 08:42:29 2010
@@ -1,6 +1,9 @@
-diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/Changes XML-TreeBuilder-patched/Changes
---- XML-TreeBuilder-3.09/Changes	2004-06-11 14:28:41.000000000 +1000
-+++ XML-TreeBuilder-patched/Changes	2009-03-16 14:30:51.000000000 +1000
+- Adds NoExpand option to avoid expanding entities in XML files
+- Adds ErrorContext option to allow better reporting of error locations.
+Origin: Fedora
+Status: to be submitted upstream
+--- a/Changes
++++ b/Changes
 @@ -1,5 +1,10 @@
 -# Time-stamp: "2004-06-10 20:28:41 ADT"
 +2009-16-03 Jeff Fearn <jfearn at redhat.com>
@@ -13,10 +16,9 @@
  
  2004-06-10   Sean M. Burke <sburke at cpan.org>
  
-diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm
---- XML-TreeBuilder-3.09/lib/XML/TreeBuilder.pm	2004-06-11 13:59:14.000000000 +1000
-+++ XML-TreeBuilder-patched/lib/XML/TreeBuilder.pm	2009-09-29 09:21:18.000000000 +1000
-@@ -5,6 +7,7 @@
+--- a/lib/XML/TreeBuilder.pm
++++ b/lib/XML/TreeBuilder.pm
+@@ -5,6 +5,7 @@
  use strict;
  use XML::Element ();
  use XML::Parser ();
@@ -24,7 +26,7 @@
  use vars qw(@ISA $VERSION);
  
  $VERSION = '3.09';
-@@ -12,8 +15,15 @@
+@@ -12,8 +13,15 @@
  
  #==========================================================================
  sub new {
@@ -42,7 +44,7 @@
    
    my $self = XML::Element->new('NIL');
    bless $self, $class; # and rebless
-@@ -21,57 +31,76 @@
+@@ -21,57 +29,76 @@
    $self->{'_store_comments'}     = 0;
    $self->{'_store_pis'}          = 0;
    $self->{'_store_declarations'} = 0;
@@ -139,7 +141,7 @@
           )
         );
         return;
-@@ -80,11 +109,11 @@
+@@ -80,11 +107,11 @@
      'Element' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -156,7 +158,7 @@
           )
         );
         return;
-@@ -93,17 +122,32 @@
+@@ -93,32 +120,47 @@
      'Doctype' => sub {
         return unless $self->{'_store_declarations'};
         shift;
@@ -195,7 +197,6 @@
    
    return $self;
  }
-@@ -110,15 +155,15 @@
  #==========================================================================
  sub _elem # universal accessor...
  {
@@ -215,9 +216,8 @@
  
  #==========================================================================
  
-diff -rubB --exclude=.svn --exclude='*.swp' XML-TreeBuilder-3.09/t/10main.t XML-TreeBuilder-patched/t/10main.t
---- XML-TreeBuilder-3.09/t/10main.t	2009-09-28 14:00:50.000000000 +1000
-+++ XML-TreeBuilder-patched/t/10main.t	2009-09-28 14:00:54.000000000 +1000
+--- a/t/10main.t
++++ b/t/10main.t
 @@ -2,7 +2,7 @@
  # Time-stamp: "2004-06-10 20:22:53 ADT" 
  
@@ -237,7 +237,7 @@
  
  unless( $ENV{'HARNESS_ACTIVE'} ) {
    $x->dump;
-@@ -43,6 +44,27 @@
+@@ -45,6 +44,27 @@
  $x->delete;
  $y->delete;