Revert r256 to be able to apply a proper fix.

ChangeLog

@@ -35,11 +35,6 @@
 
 	* src/filesdb.c: Fix a typo (unexecpted -> unexpected).
 
-2006-04-22  Clint Adams  <schizo@debian.org>
-
-	* scripts/install-info.pl: Strip any trailing '/dir' from the
-	'--dir-file' option parameter, to make it GNU install-info compatible.
-
 2006-04-21  Guillem Jover  <guillem@debian.org>
 
 	* src/query.c (enqperpackage): Change dynamically constructed

debian/changelog

@@ -31,8 +31,6 @@ dpkg (1.13.19~) UNRELEASED; urgency=low
 
   [ Guillem Jover ]
   * Fix strings so that they can be more easily translated. Closes: #134358
-  * Strip the trailing '/dir' from '--dir-file' option parameter to make it
-    GNU install-info compatible (Clint Adams). Closes: #61640, #67237
   * Add new substvars source:Version, source:Upstream-Version and
     binary:Version so packages will be able to avoid breaking on binNMUs.
     Based on a patch by Ken Bloom and Jeroen van Wolffelaar. Closes: #358530

scripts/install-info.pl

@@ -92,7 +92,6 @@ while ($ARGV[0] =~ m/^--/) {
         $description=$';
     } elsif (m/^--dir-file=/) { # for compatibility with GNU install-info
 	$infodir=$';
-	$infodir=~s/\/dir$//;
     } else {
         print STDERR "$name: unknown option \`$_'\n"; &usage(STDERR); exit 1;
     }