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 6e0a2a408f3a678566bbc5f989487336dec0467e..eaff2044dd4128f764a74df9369412314261b918 100644 (file)
--- 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 ad15a0853201ed5494b40b0e554249c2a18c8e98..fe479382a77e8cfcf17b8ac7d66b20613f7fd374 100644 (file)
--- 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 5abf86133c73d90c8052009ed9a8902a0c19f5bb..3daa033c7f907ec8436c7fc4dce0a78748d065b6 100755 (executable)
--- 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="";