[perlindex] 04/08: Drop perl4libs.patch, merged upstream.
gregor herrmann
gregoa at debian.org
Wed Dec 11 20:56:21 UTC 2013
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository perlindex.
commit 3672fba982b54b6aae7fd0145f66666643c9adea
Author: gregor herrmann <gregoa at debian.org>
Date: Wed Dec 11 21:52:56 2013 +0100
Drop perl4libs.patch, merged upstream.
---
debian/patches/perl4libs.patch | 44 ------------------------------------------
debian/patches/series | 1 -
2 files changed, 45 deletions(-)
diff --git a/debian/patches/perl4libs.patch b/debian/patches/perl4libs.patch
deleted file mode 100644
index 173e29c..0000000
--- a/debian/patches/perl4libs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Replace usage of 'find.pl' by File::Find
- find.pl is scheduled for removal from the perl core
-Author: Damyan Ivanov <dmn at debian.org>
-Forwarded: no
-
---- a/perlindex.PL
-+++ b/perlindex.PL
-@@ -187,7 +187,7 @@ if ($opt_index) {
- tie (%FN, AnyDBM_File, "$IDIR/index_fn", O_CREAT|O_RDWR, 0644)
- or die "Could not tie $IDIR/index_fn: $!\n";
-
-- require "find.pl";
-+ require File::Find;
-
- open (CONFIG, "<$conffile") || die "Can't open config file $conffile: $!";
- my @config_perllib = <CONFIG>;
-@@ -205,7 +205,7 @@ if ($opt_index) {
- my $target = readlink $dir;
- $dir =~ s:[^/]+$:$target:;
- }
-- &find($dir);
-+ File::Find::find( \&wanted, $dir );
- }
- }
-
-@@ -287,13 +287,13 @@ if ($opt_index) {
- }
-
- sub wanted {
-- my $fns = $name;
-+ my $fns = $File::Find::name;
-
-- if ($name eq $man3direxp) {
-- $prune = 1;
-+ if ($File::Find::name eq $man3direxp) {
-+ $File::Find::prune = 1;
- }
-- if (-f $_ and $name =~ /man|bin|\.(pod|pm|txt)$/) {
-- add_to_index($name);
-+ if (-f $_ and $File::Find::name =~ /man|bin|\.(pod|pm|txt)$/) {
-+ add_to_index($File::Find::name);
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 9366445..1e9a465 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
conffile.patch
testsuite.patch
spelling.patch
-perl4libs.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/perlindex.git
More information about the Pkg-perl-cvs-commits
mailing list