Previous install-infos(before 1.10) handled multiple dir file entries,

because they would copy the entire stanza unmodified.  The newest version
does not do this, as it reformats the options, and thereby only takes the
first line.  So, we now split all the lines from the stanza, and process
them all.

diff --git a/ChangeLog b/ChangeLog
index ebce2bde96eaf96c496d153aa5670531a0329581..7493186b1b6dd7fc6474276df3896decf0ba45da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Aug 24 15:36:41 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * scripts/install-info.pl: Previous install-infos(before 1.10) handled
+    multiple dir file entries, because they would copy the entire stanza
+    unmodified.  The newest version does not do this, as it reformats the
+    options, and thereby only takes the first line.  So, we now split all
+    the lines from the stanza, and process them all.
+
 Sat Aug 24 14:47:56 CDT 2002 Adam Heath <doogie@debian.org>
 
   * archtable: Add i386-gnu0.3.

diff --git a/debian/changelog b/debian/changelog
index 718656328271684ff3f0ead7667e96edfee17fac..2fa8be45c08fe0c79b64aded9f7dbf2bc3c6ab77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ dpkg (1.10.5) unstable; urgency=low
   * Fixes for HURD:  Closes: #156545
     * Add i386-gnu0.3 to archtable.
     * Fix handling of static compiles, with regard to zlib.
+  * Previous install-infos(before 1.10) handled multiple dir file entries,
+    because they would copy the entire stanza unmodified.  The newest
+    version does not do this, as it reformats the options, and thereby
+    only takes the first line.  So, we now split all the lines from the
+    stanza, and process them all.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 

diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index d5b5a40598737c98713bd7ad4789bf2af1429eae..b497192b3bb12b49385fc160ed0bd80197115125 100755 (executable)
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -339,7 +339,7 @@ if (!$remove) {
         $mss= $#work+1;
     }
 
-    @work= (@work[0..$mss-1], $infoentry, @work[$mss..$#work]);
+    @work= (@work[0..$mss-1], map("$_\n",split(/\n/,$infoentry)), @work[$mss..$#work]);
     
 } else {