changed debian/source/format to native
This commit is contained in:
parent
b9b418347f
commit
90eca68d8e
|
@ -1,22 +0,0 @@
|
|||
From: intrigeri <intrigeri@boum.org>
|
||||
Date: Sun, 21 Jul 2019 13:47:20 +0000
|
||||
Origin: https://github.com/grantm/XML-SAX/pull/4
|
||||
Subject: Fix another typo in POD
|
||||
|
||||
---
|
||||
lib/XML/SAX/Intro.pod | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/XML/SAX/Intro.pod b/lib/XML/SAX/Intro.pod
|
||||
index 2c66b3b..e3593b1 100644
|
||||
--- a/lib/XML/SAX/Intro.pod
|
||||
+++ b/lib/XML/SAX/Intro.pod
|
||||
@@ -294,7 +294,7 @@ The handler is passed a structure containing just two entries:
|
||||
|
||||
=item Target
|
||||
|
||||
-The target of the processing instrcution
|
||||
+The target of the processing instruction
|
||||
|
||||
=item Data
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
Description: Fix charset decoding in the PurePerl module (#405186)
|
||||
Author: Niko Tyni <ntyni@iki.fi>
|
||||
Date: Sun, 04 Nov 2007 20:46:58 +0200
|
||||
|
||||
--- a/lib/XML/SAX/PurePerl/Productions.pm
|
||||
+++ b/lib/XML/SAX/PurePerl/Productions.pm
|
||||
@@ -39,7 +39,7 @@
|
||||
# can't do this one without unicode
|
||||
# $CombiningChar = qr/^$/msx;
|
||||
|
||||
- $NameChar = qr/^ (?: $BaseChar | $Digit | [._:-] | $Extender )+ $/x;
|
||||
+ $NameChar = qr/ (?: $BaseChar | $Digit | [._:-] | $Extender )+ /x;
|
||||
PERL
|
||||
die $@ if $@;
|
||||
}
|
||||
--- a/lib/XML/SAX/PurePerl.pm
|
||||
+++ b/lib/XML/SAX/PurePerl.pm
|
||||
@@ -677,7 +677,7 @@
|
||||
|
||||
return unless length($name);
|
||||
|
||||
- $name =~ /$NameChar/o or $self->parser_error("Name <$name> does not match NameChar production", $reader);
|
||||
+ $name =~ /^$NameChar+$/o or $self->parser_error("Name <$name> does not match NameChar production", $reader);
|
||||
|
||||
return $name;
|
||||
}
|
|
@ -1,129 +0,0 @@
|
|||
Description: The Debian way of handling ParserDetails.ini
|
||||
Use update-perl-sax-parsers(8) instead.
|
||||
.
|
||||
* SAX.pm: the meat of the modifications
|
||||
+ add XML::SAX->save_parsers_debian(), used by update-perl-sax-parsers
|
||||
+ disable XML::SAX->save_parsers() with a helpful error message for
|
||||
users trying to install SAX parsers manually from CPAN
|
||||
* Makefile.PL: Don't try to modify ParserDetails.ini when building the package
|
||||
* t/01known.t, t/99cleanup.t: Skip tests related to XML::SAX->save_parsers()
|
||||
Author: Originally by Ardo van Rangelrooij <ardo@debian.org>
|
||||
Author: Cleanups and quilt conversion by Niko Tyni <ntyni@iki.fi>
|
||||
Author: Ansgar Burchardt <ansgar@43-1.org> (XML::SAX::Debian)
|
||||
|
||||
--- a/t/01known.t
|
||||
+++ b/t/01known.t
|
||||
@@ -1,6 +1,9 @@
|
||||
-use Test;
|
||||
+use Test::More;
|
||||
BEGIN { plan tests => 3 }
|
||||
+SKIP: {
|
||||
+skip 'Tests skipped due to Debian modifications', 3;
|
||||
use XML::SAX;
|
||||
ok(XML::SAX->save_parsers);
|
||||
ok(XML::SAX->load_parsers);
|
||||
ok(@{XML::SAX->parsers}, 0);
|
||||
+}
|
||||
--- a/t/99cleanup.t
|
||||
+++ b/t/99cleanup.t
|
||||
@@ -1,7 +1,7 @@
|
||||
use Test;
|
||||
BEGIN { plan tests => 1 }
|
||||
use File::Spec;
|
||||
-ok(unlink(
|
||||
+skip('Test skipped due to Debian modifications', unlink(
|
||||
File::Spec->catdir(qw(blib lib XML SAX ParserDetails.ini))),
|
||||
1,
|
||||
'delete ParserDetails.ini'
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -27,6 +27,10 @@
|
||||
package MY;
|
||||
my $script = shift->SUPER::install(@_);
|
||||
|
||||
+ print STDERR "Debian build: won't modify ParserDetails.ini when installing.\n";
|
||||
+ print STDERR " (use update-perl-sax-parsers(8) instead.)\n";
|
||||
+ return $script;
|
||||
+
|
||||
# Only modify existing ParserDetails.ini if user agrees
|
||||
|
||||
my $write_ini_ok = 0;
|
||||
--- a/lib/XML/SAX.pm
|
||||
+++ b/lib/XML/SAX.pm
|
||||
@@ -179,6 +179,15 @@
|
||||
sub save_parsers {
|
||||
my $class = shift;
|
||||
|
||||
+ ### DEBIAN MODIFICATION
|
||||
+ print "\n";
|
||||
+ print "Please use 'update-perl-sax-parsers(8) to register this parser.'\n";
|
||||
+ print "See /usr/share/doc/libxml-sax-perl/README.Debian.gz for more info.\n";
|
||||
+ print "\n";
|
||||
+
|
||||
+ return $class; # rest of the function is disabled on Debian.
|
||||
+ ### END DEBIAN MODIFICATION
|
||||
+
|
||||
# get directory from wherever XML::SAX is installed
|
||||
my $dir = $INC{'XML/SAX.pm'};
|
||||
$dir = dirname($dir);
|
||||
@@ -212,6 +221,10 @@
|
||||
warn(@_) unless $ENV{HARNESS_ACTIVE};
|
||||
}
|
||||
|
||||
+sub _is_vendor_supplied {
|
||||
+ 1;
|
||||
+}
|
||||
+
|
||||
1;
|
||||
__END__
|
||||
|
||||
--- /dev/null
|
||||
+++ b/lib/XML/SAX/Debian.pm
|
||||
@@ -0,0 +1,47 @@
|
||||
+package XML::SAX::Debian;
|
||||
+
|
||||
+use strict;
|
||||
+use warnings;
|
||||
+
|
||||
+use base "XML::SAX";
|
||||
+
|
||||
+use File::Spec ();
|
||||
+
|
||||
+sub save_parsers_debian {
|
||||
+ my $class = shift;
|
||||
+ my ($parser_module,$directory, $priority) = @_;
|
||||
+
|
||||
+ # add parser
|
||||
+ {
|
||||
+ # We do not want load_parsers to complain.
|
||||
+ local $ENV{HARNESS_ACTIVE} = 1;
|
||||
+ $class->load_parsers("/nonexistent");
|
||||
+ }
|
||||
+ $class->add_parser($parser_module);
|
||||
+
|
||||
+ # get parser's ParserDetails file
|
||||
+ my $file = $parser_module;
|
||||
+ $file = "${priority}-$file" if $priority != 0;
|
||||
+ $file = File::Spec->catfile($directory, $file);
|
||||
+ chmod 0644, $file;
|
||||
+ unlink($file);
|
||||
+
|
||||
+ open(my $fh, ">$file") ||
|
||||
+ die "Cannot write to $file: $!";
|
||||
+
|
||||
+ foreach my $p (@{ $class->parsers }) {
|
||||
+ print $fh "[$p->{Name}]\n";
|
||||
+ foreach my $key (keys %{$p->{Features}}) {
|
||||
+ print $fh "$key = $p->{Features}{$key}\n";
|
||||
+ }
|
||||
+ print $fh "\n";
|
||||
+ }
|
||||
+
|
||||
+ print $fh "\n";
|
||||
+
|
||||
+ close $fh;
|
||||
+
|
||||
+ return $class;
|
||||
+}
|
||||
+
|
||||
+1;
|
|
@ -1,16 +0,0 @@
|
|||
Author: gregor herrmann <gregoa@debian.org>
|
||||
Description: fix spelling errors in POD
|
||||
Origin: https://github.com/grantm/XML-SAX/pull/4
|
||||
Forwarded: yes
|
||||
|
||||
--- a/lib/XML/SAX/Intro.pod
|
||||
+++ b/lib/XML/SAX/Intro.pod
|
||||
@@ -242,7 +242,7 @@
|
||||
|
||||
=head2 characters
|
||||
|
||||
-The characters callback may be called in serveral circumstances. The
|
||||
+The characters callback may be called in several circumstances. The
|
||||
most obvious one is when seeing ordinary character data in the markup.
|
||||
But it is also called for text in a CDATA section, and is also called
|
||||
in other situations. A SAX parser has to make no guarantees whatsoever
|
|
@ -1,6 +0,0 @@
|
|||
skip-test-with-nonfree-file
|
||||
charset-decoding
|
||||
parserdetails-debian
|
||||
pod-spelling
|
||||
Fix-another-typo-in-POD.patch
|
||||
sort-ini-entries
|
|
@ -1,24 +0,0 @@
|
|||
Description: Skip a test depending on a non-free input file (testfiles/xmltest.xml)
|
||||
Origin: vendor
|
||||
Bug-Debian: https://bugs.debian.org/452872
|
||||
|
||||
--- a/t/16large.t
|
||||
+++ b/t/16large.t
|
||||
@@ -1,4 +1,4 @@
|
||||
-use Test;
|
||||
+use Test::More;
|
||||
BEGIN { plan tests => 3 }
|
||||
use XML::SAX::PurePerl;
|
||||
use XML::SAX::PurePerl::DebugHandler;
|
||||
@@ -9,8 +9,10 @@
|
||||
my $parser = XML::SAX::PurePerl->new(Handler => $handler);
|
||||
ok($parser);
|
||||
|
||||
+SKIP: {
|
||||
+skip "Non-free test input is not present in the Debian version", 1;
|
||||
my $time = time;
|
||||
$parser->parse_uri("testfiles/xmltest.xml");
|
||||
warn("parsed ", -s "testfiles/xmltest.xml", " bytes in ", time - $time, " seconds\n");
|
||||
ok(1);
|
||||
-
|
||||
+} # SKIP
|
|
@ -1,18 +0,0 @@
|
|||
From: Roland Clobus <rclobus@rclobus.nl>
|
||||
Date: Wed, 1 Sep 2021 15:10:00+0200
|
||||
Subject: Sort the entries in the .ini-files. This generates the files with a constant content
|
||||
Bug-Debian: https://bugs.debian.org/993444
|
||||
Forwarded: https://rt.cpan.org/Ticket/Display.html?id=139175
|
||||
Bug: https://rt.cpan.org/Ticket/Display.html?id=139175
|
||||
|
||||
--- a/lib/XML/SAX/Debian.pm
|
||||
+++ b/lib/XML/SAX/Debian.pm
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
foreach my $p (@{ $class->parsers }) {
|
||||
print $fh "[$p->{Name}]\n";
|
||||
- foreach my $key (keys %{$p->{Features}}) {
|
||||
+ foreach my $key (sort keys %{$p->{Features}}) {
|
||||
print $fh "$key = $p->{Features}{$key}\n";
|
||||
}
|
||||
print $fh "\n";
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
Loading…
Reference in New Issue