[SCM] Debian packaging of perlindex branch, master, updated. 5717118248f6ab17157f95924fcadac16f23ad17

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 87611ccf5e70104b4d02acb610172486c02d22b1
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed Jan 25 17:44:45 2012 +0200

    add a patch replacing usage of deprecated 'find.pl' with File::Find

diff --git a/debian/changelog b/debian/changelog
index ee3e78e..7f799c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ perlindex (1.605-4) UNRELEASED; urgency=low
     /usr/share/man
   * cron.daily: create /var/cache/perlindex if it doesn't exist
     Thanks to Ansgar Burchardt
+  * add a patch replacing usage of deprecated 'find.pl' with File::Find
 
  -- Ansgar Burchardt <ansgar at debian.org>  Wed, 27 Jul 2011 18:49:51 +0200
 
diff --git a/debian/patches/perl4libs.patch b/debian/patches/perl4libs.patch
new file mode 100644
index 0000000..173e29c
--- /dev/null
+++ b/debian/patches/perl4libs.patch
@@ -0,0 +1,44 @@
+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 1e9a465..9366445 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 conffile.patch
 testsuite.patch
 spelling.patch
+perl4libs.patch

-- 
Debian packaging of perlindex