[libxml-xpath-perl] 03/05: Drop example.patch, the changes to the script are applied upstream.
gregor herrmann
gregoa at debian.org
Fri Mar 18 17:19:54 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 0d979ccef49c43946cd9474c4b739c8386e140bb
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Mar 18 18:15:07 2016 +0100
Drop example.patch, the changes to the script are applied upstream.
---
debian/patches/example.patch | 271 -------------------------------------------
debian/patches/series | 1 -
2 files changed, 272 deletions(-)
diff --git a/debian/patches/example.patch b/debian/patches/example.patch
deleted file mode 100644
index dd2abe7..0000000
--- a/debian/patches/example.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-Author: Ardo van Rangelrooij <ardo at debian.org>
-Description:
- * examples/xpath: patched by Fabien Ninoles <fabien at Nightbird.TZoNE.ORG>
- (thanks Fabien!)
- * examples/xpath: fixed erroneous handling of filenames containing a '-'
- (closes: Bug#185292)
- * examples/xpath: fixed various small typos in the POD
- (closes: Bug#180508)
-
---- a/examples/xpath
-+++ b/examples/xpath
-@@ -1,79 +1,122 @@
- #!/usr/bin/perl
-
-+eval 'exec /usr/bin/perl -w -S $0 ${1+"$@"}'
-+ if 0; # not running under some shell
- use strict;
- use warnings;
-
- $| = 1;
-
--unless (@ARGV >= 1) {
-- print STDERR qq(Usage:
--$0 [filename] query
--
-- If no filename is given, supply XML on STDIN.
--);
-- exit;
--}
--
- use utf8;
- use XML::XPath;
- use open ':std', ':encoding(UTF-8)';
-
--my $xpath;
-+my @paths;
- my $pipeline;
--
--if ($ARGV[0] eq '-p') {
-- # pipeline mode
-- $pipeline = 1;
-- shift @ARGV;
--}
--
--if (@ARGV >= 2) {
-- $xpath = XML::XPath->new(filename => shift(@ARGV));
--}
--else {
-- $xpath = XML::XPath->new(ioref => \*STDIN);
-+my $SUFFIX = "\n";
-+my $PREFIX = "";
-+my $quiet = 0;
-+
-+PARSE: while ((@ARGV >= 1) && ($ARGV[0] =~ /^-./ )) {
-+ OPTIONS: {
-+ if ($ARGV[0] eq "-e") {
-+ shift;
-+ push @paths, shift;
-+ last OPTIONS;
-+ }
-+ if ($ARGV[0] eq "-p") {
-+ shift;
-+ $PREFIX = shift;
-+ last OPTIONS;
-+ }
-+ if ($ARGV[0] eq "-s") {
-+ shift;
-+ $SUFFIX = shift;
-+ last OPTIONS;
-+ }
-+ if ($ARGV[0] eq "-q") {
-+ $quiet = 1;
-+ shift;
-+ last OPTIONS;
-+ }
-+ if ($ARGV[0] eq "-n") {
-+ $XML::XPath::ParseParamEnt = 0;
-+ shift;
-+ last OPTIONS;
-+ }
-+ print STDERR "Unknown option ignore: ", shift;
-+ }
- }
-
--my $nodes = $xpath->find(shift @ARGV);
-+unless (@paths >= 1) {
-+ print STDERR qq(Usage:
-+$0 [options] -e query [-e query...] [filename...]
-
--unless ($nodes->isa('XML::XPath::NodeSet')) {
--NOTNODES:
-- print STDERR "Query didn't return a nodeset. Value: ";
-- print $nodes->value, "\n";
-+ If no filenams are given, supply XML on STDIN.
-+ You must provide at least one query. Each supplementary
-+ query is done in order, the previous query giving the
-+ context of the next one.
-+
-+ Options:
-+
-+ -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;
- }
-
--if ($pipeline) {
-- $nodes = find_more($nodes);
-- goto NOTNODES unless $nodes->isa('XML::XPath::NodeSet');
--}
-+do
-+{
-+ my $xpath;
-+ my @curpaths = @paths;
-+ my $filename;
-+ if (@ARGV >= 1) {
-+ $filename = shift @ARGV;
-+ $xpath = XML::XPath->new(filename => $filename);
-+ }
-+ else {
-+ $filename = 'stdin';
-+ $xpath = XML::XPath->new(ioref => \*STDIN);
-+ }
-
--if ($nodes->size) {
-- print STDERR "Found ", $nodes->size, " nodes:\n";
-- foreach my $node ($nodes->get_nodelist) {
-- print STDERR "-- NODE --\n";
-- print $node->toString;
-+ my $nodes = $xpath->find(shift @curpaths);
-+
-+ if ($nodes->isa('XML::XPath::NodeSet')) {
-+ while (@curpaths >= 1) {
-+ $nodes = find_more($xpath, shift @curpaths, $nodes);
-+ last unless $nodes->isa('XML::XPath::NodeSet');
-+ }
- }
--}
--else {
-- print STDERR "No nodes found";
--}
-
--print STDERR "\n";
-+ if ($nodes->isa('XML::XPath::NodeSet')) {
-+ if ($nodes->size) {
-+ print STDERR "Found ", $nodes->size, " nodes in $filename:\n" unless $quiet;
-+ foreach my $node ($nodes->get_nodelist) {
-+ print STDERR "-- NODE --\n" unless $quiet;
-+ print $PREFIX, $node->toString, $SUFFIX;
-+ }
-+ }
-+ else {
-+ print STDERR "No nodes found in $filename\n" unless $quiet;
-+ }
-+ }
-+ else {
-+ print STDERR "Query didn't return a nodeset. Value: ";
-+ print $nodes->value, "\n";
-+ }
-+} until (@ARGV < 1);
-
- exit;
-
- sub find_more {
-+ my $xpath = shift;
-+ my $find = shift;
- my ($nodes) = @_;
-
-- if (!@ARGV) {
-- return $nodes;
-- }
--
- my $newnodes = XML::XPath::NodeSet->new;
-
-- my $find = shift @ARGV;
--
- foreach my $node ($nodes->get_nodelist) {
- my $new = $xpath->find($find, $node);
- if ($new->isa('XML::XPath::NodeSet')) {
-@@ -84,5 +127,88 @@
- }
- }
-
-- return find_more($newnodes);
-+ return $newnodes;
- }
-+
-+__END__
-+
-+=head1 NAME
-+
-+xpath - a script to query XPath statements in XML documents.
-+
-+=head1 SYNOPSIS
-+
-+B<xpath [-s suffix] [-p prefix] [-n] [-q] -e query [-e query] ... [file] ...>
-+
-+=head1 DESCRIPTION
-+
-+B<xpath> uses the L<XML::XPath|XML::XPath> perl module to make XPath queries
-+to any XML document. The L<XML::XPath|XML::XPath> module aims to comply exactly
-+to the XPath specification at C<http://www.w3.org/TR/xpath> and yet
-+allows extensions to be added in the form of functions.
-+
-+The script takes any number of XPath pointers and tries to apply them
-+to each XML document given on the command line. If no file arguments
-+are given, the query is done using C<STDIN> as an XML document.
-+
-+When multiple queries exist, the result of the last query is used as
-+context for the next query and only the result of the last one is output.
-+The context of the first query is always the root of the current document.
-+
-+=head1 OPTIONS
-+
-+=head2 B<-q>
-+
-+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.
-+
-+=head2 B<-p prefix>
-+
-+Place C<prefix> preceding each entry. Default is nothing.
-+
-+=head1 BUGS
-+
-+The author of this man page is not very fluant in english. Please,
-+send him (L<fabien at tzone.org>) any corrections concerning this text.
-+
-+See also L<XML::XPath(3pm)>.
-+
-+=head1 SEE ALSO
-+
-+L<XML::XPath(3pm)>.
-+
-+=head1 HISTORY
-+
-+This module is copyright 2000 Fastnet Software Ltd. This is free
-+software, and as such comes with NO WARRANTY. No dates are used in this
-+module. You may distribute this module under the terms of either the
-+Gnu GPL, or under specific licencing from Fastnet Software Ltd.
-+Special free licencing consideration will be given to similarly free
-+software. Please don't flame me for this licence - I've put a lot of
-+hours into this code, and if someone uses my software in their product
-+I expect them to have the courtesy to contact me first.
-+
-+Full support for this module is available from Fastnet Software Ltd on
-+a pay per incident basis. Alternatively subscribe to the Perl-XML
-+mailing list by mailing lyris at activestate.com with the text:
-+
-+ SUBSCRIBE Perl-XML
-+
-+in the body of the message. There are lots of friendly people on the
-+list, including myself, and we'll be glad to get you started.
-+
-+Matt Sergeant, matt at sergeant.org
-+
-+This man page was added as well as some serious modifications to the script
-+by Fabien Ninoles <fabien at debian.org> for the Debian Project.
-+
-+=cut
-+
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a72915e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-example.patch
--
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