[SCM] Debian packaging of Regexp-Assemble CPAN distribution branch, master, updated. debian/0.35-6-20-g9e4c53a

Mon Apr 1 11:43:18 UTC 2013

The following commit has been merged in the master branch:
commit d43452f6f81058b30466cf6171d439273fee9964
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Mon Apr 1 13:24:59 2013 +0200

    Convert old patch into nice ones

diff --git a/debian/patches/bad-interpreter b/debian/patches/bad-interpreter
deleted file mode 100644
index 525a1d7..0000000
--- a/debian/patches/bad-interpreter
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: track example use a bad interpreter. Reported by Lintian.
- .
- The person named in the Author field signed this changelog entry.
-Author: Xavier Guimard <x.guimard at free.fr>
-
----
-
---- libregexp-assemble-perl-0.34.orig/eg/track-5.10	2012-03-26 20:14:10.000000000 +0200
-+++ libregexp-assemble-perl-0.34/eg/track-5.10	2012-03-26 20:15:42.125460314 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl5.9.5
-+#!/usr/bin/perl
- 
- use strict;
- use warnings;
diff --git a/debian/patches/debian-changes-0.34-3 b/debian/patches/debian-changes-0.34-3
deleted file mode 100644
index 3805883..0000000
--- a/debian/patches/debian-changes-0.34-3
+++ /dev/null
@@ -1,110 +0,0 @@
-Description: Upstream changes introduced in version 0.34-3
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- libregexp-assemble-perl (0.34-3) unstable; urgency=low
- .
-   * syntax error in extended description (Closes: #584774)
- .
- The person named in the Author field signed this changelog entry.
-Author: Xavier Guimard <x.guimard at free.fr>
-Bug-Debian: http://bugs.debian.org/584774
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- libregexp-assemble-perl-0.34.orig/Assemble.pm
-+++ libregexp-assemble-perl-0.34/Assemble.pm
-@@ -49,7 +49,7 @@ are still having performance problems, y
- trie. Note that Perl's own regular expression engine will implement
- trie optimisations in perl 5.10 (they are already available in
- perl 5.9.3 if you want to try them out). C<Regexp::Assemble> will
--do the right thing when it knows it's running on a a trie'd perl.
-+do the right thing when it knows it's running on a trie'd perl.
- (At least in some version after this one).
- 
- Some more examples of usage appear in the accompanying README. If
-@@ -3211,7 +3211,7 @@ Fine grained analysis of regular express
- =item Regexp::Trie
- 
- Funnily enough, this was my working name for C<Regexp::Assemble>
--during its developement. I changed the name because I thought it
-+during its development. I changed the name because I thought it
- was too obscure. Anyway, C<Regexp::Trie> does much the same as
- C<Regexp::Optimizer> and C<Regexp::Assemble> except that it runs
- much faster (according to the author). It does not recognise
---- libregexp-assemble-perl-0.34.orig/eg/stress-test.pl
-+++ libregexp-assemble-perl-0.34/eg/stress-test.pl
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#! /usr/bin/perl -w
- 
- use strict;
- use lib 'blib/lib';
---- libregexp-assemble-perl-0.34.orig/eg/track-5.10
-+++ libregexp-assemble-perl-0.34/eg/track-5.10
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl5.9.5
-+#! /usr/bin/perl5.9.5
- 
- use strict;
- use warnings;
---- libregexp-assemble-perl-0.34.orig/eg/ircwatcher
-+++ libregexp-assemble-perl-0.34/eg/ircwatcher
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#! /usr/bin/perl -w
- #
- # ircwatcher - watch an IRC stream and do things when
- #              interesting things occur
---- libregexp-assemble-perl-0.34.orig/eg/roman
-+++ libregexp-assemble-perl-0.34/eg/roman
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#! /usr/bin/perl -w
- #
- # roman - generate a regular expression that matches the roman numerals
- # from 1 to 20.
---- libregexp-assemble-perl-0.34.orig/eg/naive
-+++ libregexp-assemble-perl-0.34/eg/naive
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#! /usr/bin/perl -w
- #
- # naive - generate a regular expression that will lex regular expressions
- # it is naive in the sense that it can't lex certain patterns, such as a
---- libregexp-assemble-perl-0.34.orig/eg/tld
-+++ libregexp-assemble-perl-0.34/eg/tld
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#! /usr/bin/perl -w
- #
- # tld - generate a regular expression that matches the Internet
- #       top level domains
---- libregexp-assemble-perl-0.34.orig/eg/fee
-+++ libregexp-assemble-perl-0.34/eg/fee
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#! /usr/bin/perl -w
- 
- use strict;
- use Regexp::Assemble;
---- libregexp-assemble-perl-0.34.orig/eg/hostmatch/hostmatch
-+++ libregexp-assemble-perl-0.34/eg/hostmatch/hostmatch
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/perl -w
-+#! /usr/bin/perl -w
- #
- # hostmatch -- determine whether a DNS hostname matches a regular expression
- #
diff --git a/debian/patches/debian-changes-0.34-4 b/debian/patches/debian-changes-0.34-4
deleted file mode 100644
index e78dc45..0000000
--- a/debian/patches/debian-changes-0.34-4
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Upstream changes introduced in version 0.34-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- libregexp-assemble-perl (0.34-4) unstable; urgency=low
- .
-   * Install assemble in /usr/bin (Closes: #598712)
- .
- The person named in the Author field signed this changelog entry.
-Author: Xavier Guimard <x.guimard at free.fr>
-Bug-Debian: http://bugs.debian.org/598712
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- libregexp-assemble-perl-0.34.orig/Makefile.PL
-+++ libregexp-assemble-perl-0.34/Makefile.PL
-@@ -10,7 +10,7 @@ else {
-     print "Adding testcover target\n";
- }
- 
--my $file = [];
-+my $file = ['eg/assemble'];
- #if( my $response = prompt( 'Install eg/assemble as a program (y/N)', 'n' )) {
- #    push @$file, "eg/assemble" if $response =~ /^\s*y/im,
- #}
diff --git a/debian/patches/debian-changes-0.34-6 b/debian/patches/debian-changes-0.34-6
deleted file mode 100644
index fc8e541..0000000
--- a/debian/patches/debian-changes-0.34-6
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Upstream changes introduced in version 0.34-6
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- libregexp-assemble-perl (0.34-6) unstable; urgency=low
- .
-   * Update package description (Closes: #612719)
-   * Change name of assemble script to regexp-assemble (Closes: #603812)
- .
- The person named in the Author field signed this changelog entry.
-Author: Xavier Guimard <x.guimard at free.fr>
-Bug-Debian: http://bugs.debian.org/603812
-Bug-Debian: http://bugs.debian.org/612719
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- libregexp-assemble-perl-0.34.orig/Makefile.PL
-+++ libregexp-assemble-perl-0.34/Makefile.PL
-@@ -10,7 +10,7 @@ else {
-     print "Adding testcover target\n";
- }
- 
--my $file = ['eg/assemble'];
-+my $file = ['debian/regexp-assemble'];
- #if( my $response = prompt( 'Install eg/assemble as a program (y/N)', 'n' )) {
- #    push @$file, "eg/assemble" if $response =~ /^\s*y/im,
- #}
diff --git a/debian/patches/install-regexp-assemble.patch b/debian/patches/install-regexp-assemble.patch
new file mode 100644
index 0000000..97f92c3
--- /dev/null
+++ b/debian/patches/install-regexp-assemble.patch
@@ -0,0 +1,16 @@
+Description: install regexp-assemble file
+Author: Xavier Guimard <x.guimard at free.fr>
+Forwarded: not-needed
+Last-Update: 2013-04-01
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -10,7 +10,7 @@
+     print "Adding testcover target\n";
+ }
+ 
+-my $file = [];
++my $file = ['debian/regexp-assemble'];
+ #if( my $response = prompt( 'Install eg/assemble as a program (y/N)', 'n' )) {
+ #    push @$file, "eg/assemble" if $response =~ /^\s*y/im,
+ #}
diff --git a/debian/patches/series b/debian/patches/series
index 8747ca6..f77271e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-debian-changes-0.34-3
-debian-changes-0.34-4
-debian-changes-0.34-6
-bad-interpreter
+spelling-errors.patch
+install-regexp-assemble.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
new file mode 100644
index 0000000..403667b
--- /dev/null
+++ b/debian/patches/spelling-errors.patch
@@ -0,0 +1,26 @@
+Description: Spelling errors
+Author: Xavier Guimard <x.guimard at free.fr>
+Bug: https://rt.cpan.org/Ticket/Display.html?id=84336
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=84336
+Last-Update: 2013-04-01
+
+--- a/Assemble.pm
++++ b/Assemble.pm
+@@ -49,7 +49,7 @@
+ trie. Note that Perl's own regular expression engine will implement
+ trie optimisations in perl 5.10 (they are already available in
+ perl 5.9.3 if you want to try them out). C<Regexp::Assemble> will
+-do the right thing when it knows it's running on a a trie'd perl.
++do the right thing when it knows it's running on a trie'd perl.
+ (At least in some version after this one).
+ 
+ Some more examples of usage appear in the accompanying README. If
+@@ -3211,7 +3211,7 @@
+ =item Regexp::Trie
+ 
+ Funnily enough, this was my working name for C<Regexp::Assemble>
+-during its developement. I changed the name because I thought it
++during its development. I changed the name because I thought it
+ was too obscure. Anyway, C<Regexp::Trie> does much the same as
+ C<Regexp::Optimizer> and C<Regexp::Assemble> except that it runs
+ much faster (according to the author). It does not recognise

-- 
Debian packaging of Regexp-Assemble CPAN distribution

