install-info: Ignore wrapped lines when matching section titles

Closes: #214684

diff --git a/ChangeLog b/ChangeLog
index 03596482ed34e9796f9e0866c432f75916bc8734..8e06afacc741a3c7bd7ac5c1011c25cc8527afd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01  Ian Zimmerman  <itz@buug.org>
+
+       * scripts/install-info.pl: Ignore wrapped lines when matching
+       section titles.
+
 2008-01-01  John Zaitseff  <J.Zaitseff@zap.org.au>
 
        * dselect/baselist.cc (baselist::wordwrapinfo): Stop processing when

diff --git a/debian/changelog b/debian/changelog
index ffd368a147b9adc58579218b8ed580af3bbd38f6..141ceaf48c4fe3e7be7236231e6bef90e15804c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ dpkg (1.14.15) UNRELEASED; urgency=low
   * Do not loop endlessly in dselect with very long package descriptions.
     Closes: #179320, #342495
     Thanks to John Zaitseff.
+  * Ignore wrapped lines in install-info when matching section titles.
+    Closes: #214684
+    Thanks to Andreas Metzler and Ian Zimmerman.
 
   [ Updated dpkg translations ]
   * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918

diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index 906322c5a96a156ddcd0fded479b8b22b387891c..edaded698cce2265e23adcd5cdb8deab77d7320b 100755 (executable)
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -352,7 +352,7 @@ if (!$remove) {
         $mss= -1;
         for ($i=0; $i<=$#work; $i++) {
             $_= $work[$i];
-            next if m/^\*/;
+            next if m/^(\*|\s)/;
             next unless m/$sectionre/io;
             $mss= $i+1; last;
         }