[libxml-xpath-perl] 03/04: Drop patches that have been merged upstream.
gregor herrmann
gregoa at debian.org
Wed Feb 24 16:47:04 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 5d1e9327946f14d1c7ad8237185d001c26d66363
Author: gregor herrmann <gregoa at debian.org>
Date: Wed Feb 24 17:24:37 2016 +0100
Drop patches that have been merged upstream.
---
debian/patches/example.patch | 17 +++++-
debian/patches/fix-stringification-overload.patch | 16 -----
debian/patches/series | 3 -
debian/patches/test.patch | 61 -------------------
...ption-to-work-without-internet-connection.patch | 69 ----------------------
5 files changed, 14 insertions(+), 152 deletions(-)
diff --git a/debian/patches/example.patch b/debian/patches/example.patch
index fe8c8af..dd2abe7 100644
--- a/debian/patches/example.patch
+++ b/debian/patches/example.patch
@@ -9,7 +9,7 @@ Description:
--- a/examples/xpath
+++ b/examples/xpath
-@@ -1,79 +1,116 @@
+@@ -1,79 +1,122 @@
#!/usr/bin/perl
+eval 'exec /usr/bin/perl -w -S $0 ${1+"$@"}'
@@ -73,6 +73,11 @@ Description:
+ shift;
+ last OPTIONS;
+ }
++ if ($ARGV[0] eq "-n") {
++ $XML::XPath::ParseParamEnt = 0;
++ shift;
++ last OPTIONS;
++ }
+ print STDERR "Unknown option ignore: ", shift;
+ }
}
@@ -96,6 +101,7 @@ Description:
+ -q quiet. Only output the resulting PATH
+ -s suffix use suffix instead of linefeed.
+ -p postfix use prefix instead of nothing.
++ -n Don't use an external DTD.
+);
exit;
}
@@ -173,7 +179,7 @@ Description:
foreach my $node ($nodes->get_nodelist) {
my $new = $xpath->find($find, $node);
if ($new->isa('XML::XPath::NodeSet')) {
-@@ -84,5 +121,83 @@
+@@ -84,5 +127,88 @@
}
}
@@ -189,7 +195,7 @@ Description:
+
+=head1 SYNOPSIS
+
-+B<xpath [-s suffix] [-p prefix] [-q] -e query [-e query] ... [file] ...>
++B<xpath [-s suffix] [-p prefix] [-n] [-q] -e query [-e query] ... [file] ...>
+
+=head1 DESCRIPTION
+
@@ -212,6 +218,11 @@ Description:
+
+Be quiet. Output only errors (and no separator) on stderr.
+
++=head2 B<-n>
++
++Never use an external DTD, ie. instantiate the XML::Parser module
++with 'ParseParamEnt => 0'.
++
+=head2 B<-s suffix>
+
+Place C<suffix> at the end of each entry. Default is a linefeed.
diff --git a/debian/patches/fix-stringification-overload.patch b/debian/patches/fix-stringification-overload.patch
deleted file mode 100644
index 9e4e59b..0000000
--- a/debian/patches/fix-stringification-overload.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix XML::XPath::Literal: stringification overload
- It broke between 1.12 and 1.13.
-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
-
---- a/lib/XML/XPath/Literal.pm
-+++ b/lib/XML/XPath/Literal.pm
-@@ -8,6 +8,7 @@
-
- use overload
- '""' => \&value,
-+ 'fallback' => 1,
- 'cmp' => \&cmp;
-
- sub new {
diff --git a/debian/patches/series b/debian/patches/series
index bead183..a72915e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
example.patch
-test.patch
-fix-stringification-overload.patch
-xpath-option-to-work-without-internet-connection.patch
diff --git a/debian/patches/test.patch b/debian/patches/test.patch
deleted file mode 100644
index 3d629d2..0000000
--- a/debian/patches/test.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Extracted from the original .diff.gz
- This patch was likely already present in the initial upload of this
- package. According to
- http://snapshot.debian.org/package/libxml-xpath-perl/1.11-1/ it was
- already present in the 1.11-1 upload.
-
---- /dev/null
-+++ b/t/base.t
-@@ -0,0 +1,52 @@
-+print "1..6\n";
-+use XML::XPath;
-+use XML::XPath::Parser;
-+use XML::XPath::XMLParser;
-+
-+# $XML::XPath::Debug = 1;
-+
-+my $p = XML::XPath->new( filename => 'examples/test.xml' );
-+if ($p) { print "ok 1\n"; }
-+else { print "not ok 1\n"; }
-+
-+my $pp = XML::XPath::Parser->new();
-+if ($pp) { print "ok 2\n"; }
-+else { print "not ok 2\n"; }
-+
-+$pp->parse("variable('amount', number(number(./rate/text()) * number(./units_worked/text())))");
-+
-+my $path = $pp->parse('.//
-+ tag/
-+ child::*/
-+ processing-instruction("Fred")/
-+ self::node()[substr("33", 1, 1)]/
-+ attribute::ra[../@gunk]
-+ [(../../@att="va\'l") and (@bert = "geee")]
-+ [position() = child::para/fred]
-+ [0 -.3]/
-+ geerner[(farp | blert)[predicate[@vee]]]');
-+
-+if ($path) { print "ok 3\n"; }
-+else { print "not ok 3\n"; }
-+
-+#$path = $pp->parse('param|title');
-+
-+warn "PATH: ", $path->as_string, "\n\n";
-+
-+if ($path->as_string) { # eq q^(self::node()/descendant-or-self::node()/child::tag/child::*/child::processing-instruction('Fred')/child::id((child::xml/child::vccc/child::bbbb/attribute::fer))/self::node()[(substr(('33'),(1),(1)))]/attribute::ra[(parent::node()/attribute::gunk)][((parent::node()/parent::node()/attribute::att = ('va'l')) and ((attribute::bert = ('geee'))))][(position() = (child::para/child::fred))][(.3)]/child::geerner[((child::fart | (child::blert))[(child::predica [...]
-+ print "ok 4\n";
-+}
-+else { print "not ok 4\n"; }
-+
-+my $nodes = $p->find('/timesheet//wednesday');
-+
-+# warn "$nodes size: ", $nodes->size, "\n";
-+
-+if ($nodes->size) { print "ok 5\n"; }
-+else { print "not ok 5\n"; }
-+
-+foreach my $node ($nodes->get_nodelist) {
-+ warn "NODES:\n", XML::XPath::XMLParser::as_string($node), "\n\n";
-+}
-+
-+print "ok 6\n";
diff --git a/debian/patches/xpath-option-to-work-without-internet-connection.patch b/debian/patches/xpath-option-to-work-without-internet-connection.patch
deleted file mode 100644
index 7fd151e..0000000
--- a/debian/patches/xpath-option-to-work-without-internet-connection.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Make xpath work without internet connection
-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
-
---- a/examples/xpath
-+++ b/examples/xpath
-@@ -39,6 +39,11 @@
- shift;
- last OPTIONS;
- }
-+ if ($ARGV[0] eq "-n") {
-+ $XML::XPath::ParseParamEnt = 0;
-+ shift;
-+ last OPTIONS;
-+ }
- print STDERR "Unknown option ignore: ", shift;
- }
- }
-@@ -57,6 +62,7 @@
- -q quiet. Only output the resulting PATH
- -s suffix use suffix instead of linefeed.
- -p postfix use prefix instead of nothing.
-+ -n Don't use an external DTD.
- );
- exit;
- }
-@@ -132,7 +138,7 @@
-
- =head1 SYNOPSIS
-
--B<xpath [-s suffix] [-p prefix] [-q] -e query [-e query] ... [file] ...>
-+B<xpath [-s suffix] [-p prefix] [-n] [-q] -e query [-e query] ... [file] ...>
-
- =head1 DESCRIPTION
-
-@@ -155,6 +161,11 @@
-
- Be quiet. Output only errors (and no separator) on stderr.
-
-+=head2 B<-n>
-+
-+Never use an external DTD, ie. instantiate the XML::Parser module
-+with 'ParseParamEnt => 0'.
-+
- =head2 B<-s suffix>
-
- Place C<suffix> at the end of each entry. Default is a linefeed.
---- a/lib/XML/XPath.pm
-+++ b/lib/XML/XPath.pm
-@@ -15,6 +15,7 @@
-
- $VERSION = '1.31';
- $XML::XPath::Namespaces = 1;
-+$XML::XPath::ParseParamEnt = 1;
- $XML::XPath::Debug = 0;
-
- use Data::Dumper;
---- a/lib/XML/XPath/XMLParser.pm
-+++ b/lib/XML/XPath/XMLParser.pm
-@@ -52,7 +52,7 @@
-
- my $parser = $self->get_parser || XML::Parser->new(
- ErrorContext => 2,
-- ParseParamEnt => 1,
-+ ParseParamEnt => $XML::XPath::ParseParamEnt,
- );
-
- $parser->setHandlers(
--
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