[libxml-xpath-perl] 02/05: refresh patches with "typical" ~/.quiltrc settings

gregor herrmann gregoa at debian.org
Mon Jan 18 00:51:03 UTC 2016


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libxml-xpath-perl.

commit 570bd370c2101c9f49a1780422dc6132f0946d4b
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jan 18 01:44:53 2016 +0100

    refresh patches with "typical" ~/.quiltrc settings
    
    Gbp-Dch: Ignore
---
 debian/patches/fix-stringification-overload.patch      |  6 ++----
 debian/patches/fix_comparison_bug_RT6363.patch         |  6 ++----
 debian/patches/make-and-commutative.patch              | 16 ++++++----------
 ...th-option-to-work-without-internet-connection.patch | 18 ++++++------------
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/debian/patches/fix-stringification-overload.patch b/debian/patches/fix-stringification-overload.patch
index 5a79eda..9e4e59b 100644
--- a/debian/patches/fix-stringification-overload.patch
+++ b/debian/patches/fix-stringification-overload.patch
@@ -4,10 +4,8 @@ Author: Niko Tyni <ntyni at debian.org>
 Bug-Debian: https://bugs.debian.org/315628
 Bug: http://rt.cpan.org/Public/Bug/Display.html?id=11724
 
-Index: libxml-xpath-perl/lib/XML/XPath/Literal.pm
-===================================================================
---- libxml-xpath-perl.orig/lib/XML/XPath/Literal.pm	2016-01-15 22:09:20.328815966 +0100
-+++ libxml-xpath-perl/lib/XML/XPath/Literal.pm	2016-01-15 23:33:56.219813346 +0100
+--- a/lib/XML/XPath/Literal.pm
++++ b/lib/XML/XPath/Literal.pm
 @@ -8,6 +8,7 @@
  
  use overload
diff --git a/debian/patches/fix_comparison_bug_RT6363.patch b/debian/patches/fix_comparison_bug_RT6363.patch
index c86f0c9..a0e81aa 100644
--- a/debian/patches/fix_comparison_bug_RT6363.patch
+++ b/debian/patches/fix_comparison_bug_RT6363.patch
@@ -3,10 +3,8 @@ Bug-Debian: https://bugs.debian.org/374672
 Bug: https://rt.cpan.org/Public/Bug/Display.html?id=6363
 Author: mirod at cpan.org
 
-Index: libxml-xpath-perl/lib/XML/XPath/Expr.pm
-===================================================================
---- libxml-xpath-perl.orig/lib/XML/XPath/Expr.pm	2016-01-15 22:56:57.715748092 +0100
-+++ libxml-xpath-perl/lib/XML/XPath/Expr.pm	2016-01-15 22:57:47.643662286 +0100
+--- a/lib/XML/XPath/Expr.pm
++++ b/lib/XML/XPath/Expr.pm
 @@ -331,7 +331,7 @@
  
  sub op_le {
diff --git a/debian/patches/make-and-commutative.patch b/debian/patches/make-and-commutative.patch
index ae56c18..ea9f905 100644
--- a/debian/patches/make-and-commutative.patch
+++ b/debian/patches/make-and-commutative.patch
@@ -5,10 +5,8 @@ Bug-Debian: https://bugs.debian.org/187583
 Bug: http://rt.cpan.org/Public/Bug/Display.html?id=32012
 Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=187583;filename=187583.patch;att=1;msg=22
 
-Index: libxml-xpath-perl/lib/XML/XPath/Step.pm
-===================================================================
---- libxml-xpath-perl.orig/lib/XML/XPath/Step.pm	2016-01-15 22:09:20.328815966 +0100
-+++ libxml-xpath-perl/lib/XML/XPath/Step.pm	2016-01-15 23:46:32.938438163 +0100
+--- a/lib/XML/XPath/Step.pm
++++ b/lib/XML/XPath/Step.pm
 @@ -131,6 +131,8 @@
      my $from = shift; # context nodeset
  
@@ -28,10 +26,8 @@ Index: libxml-xpath-perl/lib/XML/XPath/Step.pm
  
      $initial_nodeset->sort;
  
-Index: libxml-xpath-perl/t/32context.t
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libxml-xpath-perl/t/32context.t	2016-01-15 23:46:32.938438163 +0100
+--- /dev/null
++++ b/t/32context.t
 @@ -0,0 +1,27 @@
 +use Test;
 +BEGIN { plan tests => 4 }
@@ -55,8 +51,8 @@ Index: libxml-xpath-perl/t/32context.t
 +<text>
 +  <para>I start the text here, I break
 +the line and I go on, I <blink>twinkle</blink> and then I go on
-+    again. 
++    again.
 +This is not a new paragraph.</para><para>This is a
-+    <important>new</important> paragraph and 
++    <important>new</important> paragraph and
 +    <blink>this word</blink> has a preceding sibling.</para>
 +</text>
diff --git a/debian/patches/xpath-option-to-work-without-internet-connection.patch b/debian/patches/xpath-option-to-work-without-internet-connection.patch
index 8677c8e..71df84e 100644
--- a/debian/patches/xpath-option-to-work-without-internet-connection.patch
+++ b/debian/patches/xpath-option-to-work-without-internet-connection.patch
@@ -3,10 +3,8 @@ Bug-Debian: https://bugs.debian.org/337584
 Author: Niko Tyni <ntyni at debian.org>
 Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?filename=xpath-external.patch;msg=42;bug=337584;att=1
 
-Index: libxml-xpath-perl/examples/xpath
-===================================================================
---- libxml-xpath-perl.orig/examples/xpath	2016-01-15 23:57:26.985257542 +0100
-+++ libxml-xpath-perl/examples/xpath	2016-01-15 23:59:41.125018246 +0100
+--- a/examples/xpath
++++ b/examples/xpath
 @@ -37,6 +37,11 @@
  			shift;
  			last OPTIONS;
@@ -48,10 +46,8 @@ Index: libxml-xpath-perl/examples/xpath
  =head2 B<-s suffix>
  
  Place C<suffix> at the end of each entry. Default is a linefeed.
-Index: libxml-xpath-perl/lib/XML/XPath.pm
-===================================================================
---- libxml-xpath-perl.orig/lib/XML/XPath.pm	2016-01-15 22:09:20.320815980 +0100
-+++ libxml-xpath-perl/lib/XML/XPath.pm	2016-01-15 23:59:41.125018246 +0100
+--- a/lib/XML/XPath.pm
++++ b/lib/XML/XPath.pm
 @@ -15,6 +15,7 @@
  
  $VERSION = '1.22';
@@ -60,10 +56,8 @@ Index: libxml-xpath-perl/lib/XML/XPath.pm
  $XML::XPath::Debug = 0;
  
  use Data::Dumper;
-Index: libxml-xpath-perl/lib/XML/XPath/XMLParser.pm
-===================================================================
---- libxml-xpath-perl.orig/lib/XML/XPath/XMLParser.pm	2016-01-15 22:09:20.328815966 +0100
-+++ libxml-xpath-perl/lib/XML/XPath/XMLParser.pm	2016-01-15 23:59:41.125018246 +0100
+--- a/lib/XML/XPath/XMLParser.pm
++++ b/lib/XML/XPath/XMLParser.pm
 @@ -53,7 +53,7 @@
  
      my $parser = $self->get_parser || XML::Parser->new(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libxml-xpath-perl.git



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