Author: guillem
Date: 2006-06-02 10:51:28 +0000 (Fri, 02 Jun 2006)
New Revision: 371
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/install-info.pl
Log:
Revert usage of English perl non-essential module from install-info.
Closes: #369928
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-06-02 06:20:29 UTC (rev 370)
+++ trunk/ChangeLog 2006-06-02 10:51:28 UTC (rev 371)
@@ -1,5 +1,9 @@
2006-06-02 Guillem Jover <[EMAIL PROTECTED]>
+ * scripts/install-info.pl: Do not use English non-essential module.
+
+2006-06-02 Guillem Jover <[EMAIL PROTECTED]>
+
* scripts/dpkg-shlibdeps.pl (@librarypaths): Add '/lib32' and
'/usr/lib32/'.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-06-02 06:20:29 UTC (rev 370)
+++ trunk/debian/changelog 2006-06-02 10:51:28 UTC (rev 371)
@@ -6,6 +6,8 @@
Josip Rodin. Closes: #45575
* Add '/lib32' and '/usr/lib32' to the dpkg-shlibdeps library path search
list. Closes: #367892
+ * Revert usage of English perl non-essential module from install-info.
+ Closes: #369928
-- Guillem Jover <[EMAIL PROTECTED]> Wed, 31 May 2006 08:03:11 +0300
Modified: trunk/scripts/install-info.pl
===================================================================
--- trunk/scripts/install-info.pl 2006-06-02 06:20:29 UTC (rev 370)
+++ trunk/scripts/install-info.pl 2006-06-02 10:51:28 UTC (rev 371)
@@ -1,7 +1,6 @@
#!/usr/bin/perl --
use Text::Wrap;
-use English;
my $dpkglibdir = "."; # This line modified by Makefile
push (@INC, $dpkglibdir);
@@ -107,15 +106,15 @@
} elsif (m/^--(c?align|maxwidth)=([0-9]+)$/) {
warn( sprintf(_g("%s: %s deprecated(ignored)"), $name, $1)."\n" );
} elsif (m/^--info-?dir=/) {
- $dirfile = $POSTMATCH . '/dir';
+ $dirfile = $' . '/dir';
} elsif (m/^--info-file=/) {
- $filename=$POSTMATCH;
+ $filename = $';
} elsif (m/^--menuentry=/) {
- $menuentry=$POSTMATCH;
+ $menuentry = $';
} elsif (m/^--description=/) {
- $description=$POSTMATCH;
+ $description = $';
} elsif (m/^--dir-file=/) { # for compatibility with GNU install-info
- $dirfile = $POSTMATCH;
+ $dirfile = $';
} else {
printf STDERR _g("%s: unknown option \`%s'")."\n", $name, $_;
&usage(STDERR); exit 1;
@@ -185,7 +184,7 @@
&dprint("multiline '$asread'");
} elsif ($asread =~ m/^\*\s*([^:]+):(\s*\(([^\)]+)\)\.|:)\s*/) {
$menuentry= $1;
- $description= $POSTMATCH;
+ $description = $';
$fileinentry = $3;
&dprint("infile menuentry '$menuentry' description
'$description'");
} elsif (length($asread)) {
@@ -209,7 +208,7 @@
$asread='';
while(<IF>) {
if (m/^\s*[Tt]his file documents/) {
- $asread=$POSTMATCH;
+ $asread = $';
last;
}
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
