From: Scott James Remnant <keybuk@debian.org>
Date: Sun, 25 Apr 2004 17:32:35 +0000 (+0000)
Subject: Slightly over-keen patch to install-info, $infodir is prepared earlier
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae342cda6aba46e3141a66622384d47d3027dcc4;p=dpkg

Slightly over-keen patch to install-info, $infodir is prepared earlier
and --dir-file actually has the same effect as another option.
---

diff --git a/ChangeLog b/ChangeLog
index 6e0a2a40..eaff2044 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Sun Apr 25 18:02:34 BST 2004 Scott James Remnant <scott@netsplit.com>
 
-  * scripts/install-info.pl: Add gndn --dir-file option for compatibility
+  * scripts/install-info.pl: Add --dir-file option for compatibility
   with GNU install-info.  Correct code to break infinite loop.
 
 Sun Apr 25 17:57:46 BST 2004 Scott James Remnant <scott@netsplit.com>
diff --git a/debian/changelog b/debian/changelog
index ad15a085..fe479382 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,7 @@ dpkg (1.10.21) unstable; urgency=low
     Closes: #161156.
   * Correctly break out of the loop in install-info.
     Closes: #124225, #160761.
-  * Add ignored --dir-file option to install-info for GNU install-info
+  * Add --dir-file option to install-info for GNU install-info
     compatibility.  Closes: #179192
   * Refer to debian-policy in dpkg-doc's description instead of the
     non-existant packaging-manual.  Closes: #120970.
diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index 5abf8613..3daa033c 100755
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -37,7 +37,6 @@ $default='/usr/share/base-files/info.dir';
 
 $menuentry="";
 $description="";
-$infodir="";
 $sectionre="";
 $sectiontitle="";
 $infoentry="";