r11432 - in /trunk/libxml-xpath-perl/debian: changelog control patches/ patches/01-fix_comparison_bug_RT6363.patch patches/series rules

hanska-guest at users.alioth.debian.org hanska-guest at users.alioth.debian.org
Wed Dec 19 15:36:11 UTC 2007


Author: hanska-guest
Date: Wed Dec 19 15:36:11 2007
New Revision: 11432

URL: http://svn.debian.org/wsvn/?sc=1&rev=11432
Log:
* debian/control:
  - added myself to Uploaders
  - moved debhelper to Build-Depends, needed by clean target
  - added quilt to Build-Depends
* debian/rules:
  - updated to handle quilt patch system
* debian/patches/:
  - 01-fix_comparison_bug_RT6363.patch added (Closes: #374672)

Added:
    trunk/libxml-xpath-perl/debian/patches/
    trunk/libxml-xpath-perl/debian/patches/01-fix_comparison_bug_RT6363.patch
    trunk/libxml-xpath-perl/debian/patches/series
Modified:
    trunk/libxml-xpath-perl/debian/changelog
    trunk/libxml-xpath-perl/debian/control
    trunk/libxml-xpath-perl/debian/rules

Modified: trunk/libxml-xpath-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-xpath-perl/debian/changelog?rev=11432&op=diff
==============================================================================
--- trunk/libxml-xpath-perl/debian/changelog (original)
+++ trunk/libxml-xpath-perl/debian/changelog Wed Dec 19 15:36:11 2007
@@ -1,11 +1,22 @@
 libxml-xpath-perl (1.13-7) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza).
   * Set Maintainer to Debian Perl Group.
   * Use dist-based URL in debian/watch.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 01 Dec 2007 18:55:47 +0100
+  [ David Paleino ]
+  * debian/control:
+    - added myself to Uploaders
+    - moved debhelper to Build-Depends, needed by clean target
+    - added quilt to Build-Depends
+  * debian/rules:
+    - updated to handle quilt patch system
+  * debian/patches/:
+    - 01-fix_comparison_bug_RT6363.patch added (Closes: #374672)
+
+ -- David Paleino <d.paleino at gmail.com>  Wed, 19 Dec 2007 16:13:31 +0100
 
 libxml-xpath-perl (1.13-6) unstable; urgency=low
 

Modified: trunk/libxml-xpath-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libxml-xpath-perl/debian/control?rev=11432&op=diff
==============================================================================
--- trunk/libxml-xpath-perl/debian/control (original)
+++ trunk/libxml-xpath-perl/debian/control Wed Dec 19 15:36:11 2007
@@ -2,12 +2,14 @@
 Section: perl
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jay Bonci <jaybonci at debian.org>
-Standards-Version: 3.6.1.0
+Uploaders: Jay Bonci <jaybonci at debian.org>,
+ David Paleino <d.paleino at gmail.com>
+Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/XML-XPath/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-xpath-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-xpath-perl/
-Build-Depends-Indep: debhelper (>= 4.1), perl, libxml-parser-perl
+Build-Depends: debhelper (>= 5), quilt
+Build-Depends-Indep: perl, libxml-parser-perl
 
 Package: libxml-xpath-perl
 Section: perl

Added: trunk/libxml-xpath-perl/debian/patches/01-fix_comparison_bug_RT6363.patch
URL: http://svn.debian.org/wsvn/trunk/libxml-xpath-perl/debian/patches/01-fix_comparison_bug_RT6363.patch?rev=11432&op=file
==============================================================================
--- trunk/libxml-xpath-perl/debian/patches/01-fix_comparison_bug_RT6363.patch (added)
+++ trunk/libxml-xpath-perl/debian/patches/01-fix_comparison_bug_RT6363.patch Wed Dec 19 15:36:11 2007
@@ -1,0 +1,97 @@
+Index: libxml-xpath-perl/XPath/Expr.pm
+===================================================================
+--- libxml-xpath-perl.orig/XPath/Expr.pm	2007-12-19 16:25:50.000000000 +0100
++++ libxml-xpath-perl/XPath/Expr.pm	2007-12-19 16:30:19.000000000 +0100
+@@ -330,7 +330,7 @@
+ 
+ sub op_le {
+     my ($node, $lhs, $rhs) = @_;
+-    op_gt($node, $rhs, $lhs);
++    op_ge($node, $rhs, $lhs);
+ }
+ 
+ sub op_ge {
+@@ -359,31 +359,21 @@
+              !$rh_results->isa('XML::XPath::NodeSet'))) {
+         # (that says: one is a nodeset, and one is not a nodeset)
+ 
+-        my ($nodeset, $other);
+-        my ($true, $false);
+         if ($lh_results->isa('XML::XPath::NodeSet')) {
+-            $nodeset = $lh_results;
+-            $other = $rh_results;
+-            # we do this because unlike ==, these ops are direction dependant
+-            ($false, $true) = (XML::XPath::Boolean->False, XML::XPath::Boolean->True);
++            foreach my $node ($lh_results->get_nodelist) {
++                if ($node->to_number->value >= $rh_results->to_number->value) {
++                    return XML::XPath::Boolean->True;
++                }
++            }
+         }
+         else {
+-            $nodeset = $rh_results;
+-            $other = $lh_results;
+-            # ditto above comment
+-            ($true, $false) = (XML::XPath::Boolean->False, XML::XPath::Boolean->True);
+-        }
+-        
+-        # True if and only if there is a node in the
+-        # nodeset such that the result of performing
+-        # the comparison on <type>(string_value($node))
+-        # is true.
+-        foreach my $node ($nodeset->get_nodelist) {
+-            if ($node->to_number->value >= $other->to_number->value) {
+-                return $true;
++            foreach my $node ($rh_results->get_nodelist) {
++                if ( $lh_results->to_number->value >= $node->to_number->value) {
++                    return XML::XPath::Boolean->True;
++                }
+             }
+         }
+-        return $false;
++        return XML::XPath::Boolean->False;
+     }
+     else { # Neither is a nodeset
+         if ($lh_results->isa('XML::XPath::Boolean') ||
+@@ -429,31 +419,21 @@
+              !$rh_results->isa('XML::XPath::NodeSet'))) {
+         # (that says: one is a nodeset, and one is not a nodeset)
+ 
+-        my ($nodeset, $other);
+-        my ($true, $false);
+         if ($lh_results->isa('XML::XPath::NodeSet')) {
+-            $nodeset = $lh_results;
+-            $other = $rh_results;
+-            # we do this because unlike ==, these ops are direction dependant
+-            ($false, $true) = (XML::XPath::Boolean->False, XML::XPath::Boolean->True);
++            foreach my $node ($lh_results->get_nodelist) {
++                if ($node->to_number->value > $rh_results->to_number->value) {
++                    return XML::XPath::Boolean->True;
++                }
++            }
+         }
+         else {
+-            $nodeset = $rh_results;
+-            $other = $lh_results;
+-            # ditto above comment
+-            ($true, $false) = (XML::XPath::Boolean->False, XML::XPath::Boolean->True);
+-        }
+-        
+-        # True if and only if there is a node in the
+-        # nodeset such that the result of performing
+-        # the comparison on <type>(string_value($node))
+-        # is true.
+-        foreach my $node ($nodeset->get_nodelist) {
+-            if ($node->to_number->value > $other->to_number->value) {
+-                return $true;
++            foreach my $node ($rh_results->get_nodelist) {
++                if ( $lh_results->to_number->value > $node->to_number->value) {
++                    return XML::XPath::Boolean->True;
++                }
+             }
+         }
+-        return $false;
++        return XML::XPath::Boolean->False;
+     }
+     else { # Neither is a nodeset
+         if ($lh_results->isa('XML::XPath::Boolean') ||

Added: trunk/libxml-xpath-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libxml-xpath-perl/debian/patches/series?rev=11432&op=file
==============================================================================
--- trunk/libxml-xpath-perl/debian/patches/series (added)
+++ trunk/libxml-xpath-perl/debian/patches/series Wed Dec 19 15:36:11 2007
@@ -1,0 +1,1 @@
+01-fix_comparison_bug_RT6363.patch

Modified: trunk/libxml-xpath-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libxml-xpath-perl/debian/rules?rev=11432&op=diff
==============================================================================
--- trunk/libxml-xpath-perl/debian/rules (original)
+++ trunk/libxml-xpath-perl/debian/rules Wed Dec 19 15:36:11 2007
@@ -10,18 +10,19 @@
 
 PACKAGE=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
 
+include /usr/share/quilt/quilt.make
 
 build:
 	dh_testdir
 	# Add here commands to compile the package.
 	perl Makefile.PL verbose INSTALLDIRS=vendor
+
 clean:
 	dh_testdir
 	dh_testroot
 
-	-$(MAKE) clean
-	rm -f Makefile.old
-	dh_clean
+	[ ! -f Makefile ] || $(MAKE) clean
+	dh_clean Makefile.old
 
 install:
 	dh_testdir




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