r23446 - in /trunk/perlindex/debian: changelog patches/conffile.patch
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Mon Jul 21 18:20:46 UTC 2008
Author: gregoa
Date: Mon Jul 21 18:20:40 2008
New Revision: 23446
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23446
Log:
Fix patch conffile.patch to actually use the directories from the config
file (closes: #458928), thanks to Slaven Rezic for the bug report.
Modified:
trunk/perlindex/debian/changelog
trunk/perlindex/debian/patches/conffile.patch
Modified: trunk/perlindex/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/changelog?rev=23446&op=diff
==============================================================================
--- trunk/perlindex/debian/changelog (original)
+++ trunk/perlindex/debian/changelog Mon Jul 21 18:20:40 2008
@@ -10,6 +10,8 @@
Uploaders.
* debian/watch: use dist-based URL.
* Change patch system from dpatch to quilt.
+ * Fix patch conffile.patch to actually use the directories from the config
+ file (closes: #458928), thanks to Slaven Rezic for the bug report.
-- gregor herrmann <gregoa at debian.org> Sun, 15 Jun 2008 17:48:26 +0200
Modified: trunk/perlindex/debian/patches/conffile.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlindex/debian/patches/conffile.patch?rev=23446&op=diff
==============================================================================
--- trunk/perlindex/debian/patches/conffile.patch (original)
+++ trunk/perlindex/debian/patches/conffile.patch Mon Jul 21 18:20:40 2008
@@ -2,7 +2,7 @@
Description: Use a config file instead of hardcoded paths to determine @perllib
--- a/perlindex.PL
+++ b/perlindex.PL
-@@ -82,6 +82,7 @@ if ($x eq "\001") {
+@@ -82,6 +82,7 @@
$index_dir = $Config{'man1direxp'};
$index_dir =~ s:/[^/]*$::;
$index_dir = $ENV{'INDEXDIR'} if $ENV{'INDEXDIR'};
@@ -10,7 +10,7 @@
print OUT <<"EOC";
\$nroff = \'$Config{'nroff'}\' || \'nroff\';
-@@ -89,6 +90,7 @@ print OUT <<"EOC";
+@@ -89,6 +90,7 @@
\$man3direxp = \'$Config{'man3direxp'}\';
\$IDIR = \'$index_dir\';
\$prefix = \'$Config{'prefix'}\';
@@ -18,7 +18,7 @@
EOC
;
-@@ -139,8 +141,13 @@ $opt_cbreak = 1;
+@@ -139,8 +141,13 @@
'verbose',
'dict:i',
'idir=s',
@@ -32,7 +32,7 @@
if (defined $opt_idir) {
$IDIR = $opt_idir; # avoid to many changes below.
}
-@@ -180,10 +187,15 @@ if ($opt_index) {
+@@ -180,10 +187,15 @@
require "find.pl";
@@ -43,13 +43,12 @@
unless (@ARGV) { # breaks compatibility :-(
my %seen;
my @perllib = grep(length && -d && !$seen{$_}++,
-- @Config{qw(installprivlib installarchlib installsitelib installvendorlib installscript installsitearch)});
-+ @Config{qw(installprivlib installarchlib installsitelib installvendorlib installscript installsitearch)}),
-+ @config_perllib;
+ @Config{qw(installprivlib installarchlib installsitelib installvendorlib installscript installsitearch)});
++ push @perllib, @config_perllib;
for $dir (@perllib) {
print "Scanning $dir ... \n";
-@@ -539,6 +551,14 @@ Switch to cbreak in menu mode or dont. B
+@@ -539,6 +551,14 @@
Generates additional information which query words have been not found
in the database and which words of the query are stopwords.
More information about the Pkg-perl-cvs-commits
mailing list