From: Guillem Jover <guillem@debian.org>
Date: Fri, 2 Jun 2006 10:51:28 +0000 (+0000)
Subject: Revert usage of English perl non-essential module from install-info.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0620f606c2fef6196346e5f89c7c212bac2e79f0;p=dpkg

Revert usage of English perl non-essential module from install-info.
Closes: #369928
---

diff --git a/ChangeLog b/ChangeLog
index cf39c4d8..7b93defb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-02  Guillem Jover  <guillem@debian.org>
+
+	* scripts/install-info.pl: Do not use English non-essential module.
+
 2006-06-02  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-shlibdeps.pl (@librarypaths): Add '/lib32' and
diff --git a/debian/changelog b/debian/changelog
index 4c4dc3d0..67348b93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dpkg (1.13.21~) UNRELEASED; urgency=low
     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 <guillem@debian.org>  Wed, 31 May 2006 08:03:11 +0300
 
diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index e37be86c..9cd76413 100755
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -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 @@ while ($ARGV[0] =~ m/^--/) {
     } 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 @@ if (!$remove) {
             &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 @@ if (!$remove) {
             $asread='';
             while(<IF>) {
                 if (m/^\s*[Tt]his file documents/) {
-                    $asread=$POSTMATCH;
+                    $asread = $';
                     last;
                 }
             }