[libsyntax-highlight-engine-kate-perl] 04/06: Drop patches, both applied upstream.
gregor herrmann
gregoa at debian.org
Sat Jun 7 08:49:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libsyntax-highlight-engine-kate-perl.
commit b295768fe291f3eb7c9e20ef20cb70b6c908d2bc
Author: gregor herrmann <gregoa at debian.org>
Date: Sat Jun 7 10:44:23 2014 +0200
Drop patches, both applied upstream.
---
.../patches/Support-case-insensitive-names.patch | 76 ----------------------
debian/patches/series | 2 -
debian/patches/spelling.patch | 40 ------------
3 files changed, 118 deletions(-)
diff --git a/debian/patches/Support-case-insensitive-names.patch b/debian/patches/Support-case-insensitive-names.patch
deleted file mode 100644
index 1e405e3..0000000
--- a/debian/patches/Support-case-insensitive-names.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Description: Support case-insensitive names
- Patch taken from upstream commit
-Author: Jeff Fearn <jfearn at redhat.com>
-Origin: upstream
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=84982
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742667
-Applied-Upstream: https://github.com/szabgab/Syntax-Highlight-Engine-Kate/commit/9fa9156674aa04156940a7139e525f06e3245a88
-Last-Update: 2014-03-26
---- a/lib/Syntax/Highlight/Engine/Kate.pm
-+++ b/lib/Syntax/Highlight/Engine/Kate.pm
-@@ -616,11 +616,30 @@
- }
-
- sub languagePlug {
-- my ($self, $req) = @_;
-+ my ($self, $req, $insensitive) = @_;
-+
- unless (exists($self->{'syntaxes'}->{$req})) {
-- warn "undefined language: $req";
-- return undef;
-+ if (defined($insensitive) && $insensitive) {
-+ my $matched = 0;
-+ foreach my $key (keys(%{$self->{'syntaxes'}})) {
-+ if (lc($key) eq lc($req)) {
-+ warn "substituting language $key for $req";
-+ $req = $key;
-+ $matched = 1;
-+ last;
-+ }
-+ }
-+
-+ unless ($matched) {
-+ warn "undefined language: $req";
-+ return undef;
-+ }
-+ } else {
-+ warn "undefined language: $req";
-+ return undef;
-+ }
- }
-+
- return $self->{'syntaxes'}->{$req};
- }
-
-@@ -804,9 +823,13 @@
-
- returns a list of languages for which plugins have been defined.
-
--=item B<languagePlug>(I<$language>);
-+=item B<languagePlug>(I<$language>, I<?$insensitive?>);
-+
-+Returns the module name of the plugin for B<$language>.
-+
-+If B<$insensitive> is set it will also try to match names ignoring case and return the correct module name of the plugin.
-
--returns the module name of the plugin for B<$language>
-+e.g. $highlighter->languagePlug('HtMl', 1); will return 'HTML'.
-
- =item B<languagePropose>(I<$filename>);
-
---- /dev/null
-+++ b/t/10-case.t
-@@ -0,0 +1,13 @@
-+use strict;
-+use warnings;
-+
-+use Test::More tests => 4;
-+use Syntax::Highlight::Engine::Kate;
-+
-+my $hl = new Syntax::Highlight::Engine::Kate();
-+
-+is($hl->languagePlug( 'HTML'), 'HTML', 'Standard "HTML" should work');
-+is($hl->languagePlug( 'html'), undef, 'Standard "html" should not work');
-+is($hl->languagePlug( 'HTML', 1), 'HTML', 'Insesitive "HTML" should work');
-+is($hl->languagePlug( 'html', 1), 'HTML', 'Insesitive "html" should work');
-+
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bc52179..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Support-case-insensitive-names.patch
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 7a0c8e7..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: spelling fix
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=88156
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=88156
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-08-26
-
---- a/lib/Syntax/Highlight/Engine/Kate.pm
-+++ b/lib/Syntax/Highlight/Engine/Kate.pm
-@@ -792,7 +792,7 @@
-
- =item B<format_table>
-
--This option must be specified if the B<highlightText> method needs to do anything usefull for you.
-+This option must be specified if the B<highlightText> method needs to do anything useful for you.
- All mentioned keys in the synopsis must be specified.
-
-
---- a/t/perl/before/kate.pl
-+++ b/t/perl/before/kate.pl
-@@ -773,7 +773,7 @@
-
- =item B<format_table>
-
--This option must be specified if the B<highlightText> method needs to do anything usefull for you.
-+This option must be specified if the B<highlightText> method needs to do anything useful for you.
- All mentioned keys in the synopsis must be specified.
-
-
---- a/t/perl/highlighted/kate.pl
-+++ b/t/perl/highlighted/kate.pl
-@@ -773,7 +773,7 @@
- </comment><comment>
- </comment><comment>=item B<format_table></comment><comment>
- </comment><comment>
--</comment><comment>This option must be specified if the B<highlightText> method needs to do anything usefull for you.</comment><comment>
-+</comment><comment>This option must be specified if the B<highlightText> method needs to do anything useful for you.</comment><comment>
- </comment><comment>All mentioned keys in the synopsis must be specified.</comment><comment>
- </comment><comment>
- </comment><comment>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libsyntax-highlight-engine-kate-perl.git
More information about the Pkg-perl-cvs-commits
mailing list