Change formatting of info.dir.

diff --git a/ChangeLog b/ChangeLog
index 834a633a04fb2e61fbc8ba499a5d9910c1bb6a60..8fab6258dbf04dabccad1a8adb6096458a28bd29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct 25 15:45:48 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/install-info.pl: Change formatting of info.dir.
+
 Sat Oct 25 15:04:41 CDT 2003 Adam Heath <doogie@debian.org>
 
   * lib/mlib.c, include/dpkg.h.in, utils/md5sum.c: Change limit and the

diff --git a/debian/changelog b/debian/changelog
index aab6a4b0a2f1400a86f5fd6c20aa0759cbdcef58..6237ed629e5d30dd4d0398c3571073a1cd4f9240 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,8 @@ dpkg (1.10.16) unstable; urgency=low
   * Fix md5sum when handling large files.  Closes: #162691
   * Fix dpkg-checkbuilddeps calling of parsedep.  It wasn't setting
     use_arch.  Closes: #212796.
+  * Joey Hess <joeyh@debian.org>:
+    Change formatting of info.dir.  Closes: #167379.
 
  -- Adam Heath <doogie@debian.org>  Tue, 23 Sep 2003 12:12:38 -0500
 

diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index 19f3eab5634ae0bec0d90893fc54ce12c99f795c..6d1ccc239d6b7370844050d54ca493706f4b7089 100755 (executable)
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -421,12 +421,20 @@ for ($i=0; $i<=$#work; $i++) {
 }
 @work = @work[0..$j];
 
+my $descalign=40;
+
 @newwork = ();
 foreach ( @work ) {
        if ( m/^(\* *[^:]+: *\(\w[^\)]*\)[^.]*\.)[ \t]*(.*)/ ||
                m/^([ \t]+)(.*)/ ) {
-               $_ = $1 . ( " " x ( $length - length($1) + 1 ) ) . $2;
-               push @newwork, split( "\n", wrap('', " " x ( $length + 1 ), $_ ) );
+               if (length $1 >= $descalign) {
+                       push @newwork, $1;
+                       $_=(" " x $descalign) . $2;
+               }
+               else {
+                       $_ = $1 . (" " x ($descalign - length $1)) . $2;
+               }
+               push @newwork, split( "\n", wrap('', " " x $descalign, $_ ) );
        } else {
                push @newwork, $_;
        }