r14711 - in /trunk/libxml-mini-perl/debian: changelog patches/fix-attribute-value-parsing.diff patches/fix-nested-nodes-parsing.diff patches/header-attributes-sorting.diff patches/series rules
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Sun Feb 10 21:37:45 UTC 2008
Author: hertzog
Date: Sun Feb 10 21:37:45 2008
New Revision: 14711
URL: http://svn.debian.org/wsvn/?sc=1&rev=14711
Log:
* Separate the patches contained in the .diff.gz in independent patches.
Updated them for the new upstream version.
* Remove some cruft in debian/rules.
Added:
trunk/libxml-mini-perl/debian/patches/fix-attribute-value-parsing.diff
trunk/libxml-mini-perl/debian/patches/fix-nested-nodes-parsing.diff
trunk/libxml-mini-perl/debian/patches/header-attributes-sorting.diff
Modified:
trunk/libxml-mini-perl/debian/changelog
trunk/libxml-mini-perl/debian/patches/series
trunk/libxml-mini-perl/debian/rules
Modified: trunk/libxml-mini-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-mini-perl/debian/changelog?rev=14711&op=diff
==============================================================================
--- trunk/libxml-mini-perl/debian/changelog (original)
+++ trunk/libxml-mini-perl/debian/changelog Sun Feb 10 21:37:45 2008
@@ -1,4 +1,4 @@
-libxml-mini-perl (1.38-1) UNRELEASED; urgency=low
+libxml-mini-perl (1.38-1) unstable; urgency=low
[ gregor herrmann ]
* New upstream release.
@@ -25,10 +25,11 @@
[ Raphael Hertzog ]
* Drop version mangling in watch file.
- * TODO: the conflicting patches have not been all integrated upstream. They
- need updating.
+ * Separate the patches contained in the .diff.gz in independent patches.
+ Updated them for the new upstream version.
+ * Remove some cruft in debian/rules.
- -- gregor herrmann <gregor+debian at comodo.priv.at> Sun, 10 Feb 2008 05:12:30 +0100
+ -- Raphael Hertzog <hertzog at debian.org> Sun, 10 Feb 2008 22:20:46 +0100
libxml-mini-perl (1.2.8-4) unstable; urgency=low
Added: trunk/libxml-mini-perl/debian/patches/fix-attribute-value-parsing.diff
URL: http://svn.debian.org/wsvn/trunk/libxml-mini-perl/debian/patches/fix-attribute-value-parsing.diff?rev=14711&op=file
==============================================================================
--- trunk/libxml-mini-perl/debian/patches/fix-attribute-value-parsing.diff (added)
+++ trunk/libxml-mini-perl/debian/patches/fix-attribute-value-parsing.diff Sun Feb 10 21:37:45 2008
@@ -1,0 +1,15 @@
+Fix attribute value parsing. See http://bugs.debian.org/278669
+
+Index: libxml-mini-perl/lib/XML/Mini/Document.pm
+===================================================================
+--- libxml-mini-perl.orig/lib/XML/Mini/Document.pm 2008-02-10 22:16:38.000000000 +0100
++++ libxml-mini-perl/lib/XML/Mini/Document.pm 2008-02-10 22:16:49.000000000 +0100
+@@ -837,7 +837,7 @@
+
+ return undef unless (defined $attrString);
+ my $count = 0;
+- while ($attrString =~ /([^\s]+)\s*=\s*(['"])([^\2]*?)\2/g)
++ while ($attrString =~ /([^\s=]+)\s*=\s*(['"])([^\2]*?)\2/g)
+ {
+ my $attrname = $1;
+ my $attrval = $3;
Added: trunk/libxml-mini-perl/debian/patches/fix-nested-nodes-parsing.diff
URL: http://svn.debian.org/wsvn/trunk/libxml-mini-perl/debian/patches/fix-nested-nodes-parsing.diff?rev=14711&op=file
==============================================================================
--- trunk/libxml-mini-perl/debian/patches/fix-nested-nodes-parsing.diff (added)
+++ trunk/libxml-mini-perl/debian/patches/fix-nested-nodes-parsing.diff Sun Feb 10 21:37:45 2008
@@ -1,0 +1,17 @@
+Fix nested node parsing. See http://bugs.debian.org/292987.
+
+Index: libxml-mini-perl/lib/XML/Mini/Document.pm
+===================================================================
+--- libxml-mini-perl.orig/lib/XML/Mini/Document.pm 2008-02-10 21:29:10.000000000 +0100
++++ libxml-mini-perl/lib/XML/Mini/Document.pm 2008-02-10 22:16:38.000000000 +0100
+@@ -532,7 +532,9 @@
+ } else {
+
+ $XMLString =~ s/>\s*\n/>/gsm;
+- if ($XMLString =~ m/^\s*<\s*([^\s>]+)([^>]*>).*<\s*\/\1\s*>/osm)
++ # Removed the "m" switch here otherwise having text lines
++ # before the first tag was causing an infinite loop
++ if ($XMLString =~ m/^\s*<\s*([^\s>]+)([^>]*>).*<\s*\/\1\s*>/os)
+ {
+ # starts with a normal <tag> ... </tag> but has some ?? in it
+
Added: trunk/libxml-mini-perl/debian/patches/header-attributes-sorting.diff
URL: http://svn.debian.org/wsvn/trunk/libxml-mini-perl/debian/patches/header-attributes-sorting.diff?rev=14711&op=file
==============================================================================
--- trunk/libxml-mini-perl/debian/patches/header-attributes-sorting.diff (added)
+++ trunk/libxml-mini-perl/debian/patches/header-attributes-sorting.diff Sun Feb 10 21:37:45 2008
@@ -1,0 +1,74 @@
+Fix XML header creation. See http://bugs.debian.org/335841
+Fix sorting of attributes in XML headers. See http://bugs.debian.org/335846
+
+The patches have been updated for the version 1.38.
+
+Index: libxml-mini-perl/lib/XML/Mini/Element/Header.pm
+===================================================================
+--- libxml-mini-perl.orig/lib/XML/Mini/Element/Header.pm 2008-02-10 22:34:14.000000000 +0100
++++ libxml-mini-perl/lib/XML/Mini/Element/Header.pm 2008-02-10 22:35:38.000000000 +0100
+@@ -39,17 +39,27 @@
+
+ my $retString = "$spaces<?". $self->name() ;
+
+- my $attribString;
++ my $attribString = '';
+
+- # make sure version is always first
++ # make sure version/encoding/standalone is always first
+ if (exists $self->{'_attributes'}->{'version'})
+ {
+- $attribString = ' version="' . $self->{'_attributes'}->{'version'} . '"';
+- delete $self->{'_attributes'}->{'version'};
++ $attribString .= ' version="' . $self->{'_attributes'}->{'version'} . '"';
+ }
+
++ if (exists $self->{'_attributes'}->{'encoding'})
++ {
++ $attribString .= ' encoding="' . $self->{'_attributes'}->{'encoding'} . '"';
++ }
++
++ if (exists $self->{'_attributes'}->{'standalone'})
++ {
++ $attribString .= ' standalone="' . $self->{'_attributes'}->{'standalone'} . '"';
++ }
++
+ foreach my $atName (sort keys %{$self->{'_attributes'}})
+ {
++ next if $atName =~ /^(?:version|encoding|standalone)$/;
+ $attribString .= qq| $atName="$self->{'_attributes'}->{$atName}"|;
+ }
+
+@@ -70,11 +80,29 @@
+ {
+ my $self = shift;
+
+- my $retString = '<? ' . $self->name();
+- my $attribString;
++ my $retString = '<?' . $self->name();
++ my $attribString = '';
++
++ # make sure version/encoding/standalone is always first
++ if (exists $self->{'_attributes'}->{'version'})
++ {
++ $attribString .= ' version="' . $self->{'_attributes'}->{'version'} . '"';
++ }
++
++ if (exists $self->{'_attributes'}->{'encoding'})
++ {
++ $attribString .= ' encoding="' . $self->{'_attributes'}->{'encoding'} . '"';
++ }
++
++ if (exists $self->{'_attributes'}->{'standalone'})
++ {
++ $attribString .= ' standalone="' . $self->{'_attributes'}->{'standalone'} . '"';
++ }
++
+ foreach my $atName (sort keys %{$self->{'_attributes'}})
+ {
+- $attribString .= qq|$atName="$self->{'_attributes'}->{$atName}" |;
++ next if $atName =~ /^(?:version|encoding|standalone)$/;
++ $attribString .= qq| $atName="$self->{'_attributes'}->{$atName}"|;
+ }
+ if (defined $attribString && $attribString =~ m|\S|)
+ {
Modified: trunk/libxml-mini-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libxml-mini-perl/debian/patches/series?rev=14711&op=diff
==============================================================================
--- trunk/libxml-mini-perl/debian/patches/series (original)
+++ trunk/libxml-mini-perl/debian/patches/series Sun Feb 10 21:37:45 2008
@@ -1,1 +1,4 @@
pod-fixes.diff
+header-attributes-sorting.diff
+fix-nested-nodes-parsing.diff
+fix-attribute-value-parsing.diff
Modified: trunk/libxml-mini-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libxml-mini-perl/debian/rules?rev=14711&op=diff
==============================================================================
--- trunk/libxml-mini-perl/debian/rules (original)
+++ trunk/libxml-mini-perl/debian/rules Sun Feb 10 21:37:45 2008
@@ -71,8 +71,5 @@
dh_md5sums
dh_builddeb
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
More information about the Pkg-perl-cvs-commits
mailing list