Author: adam-guest
Date: 2008-03-01 11:59:04 +0000 (Sat, 01 Mar 2008)
New Revision: 1090

Modified:
   trunk/debian/changelog
   trunk/scripts/debchange.pl
Log:
debchange: Apply a more elegant fix for the bugfix in 2.10.18.
  Thanks to gregor herrmann for pointing the obvious solution out.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-03-01 11:54:04 UTC (rev 1089)
+++ trunk/debian/changelog      2008-03-01 11:59:04 UTC (rev 1090)
@@ -2,6 +2,8 @@
 
   * debsign: Correctly handle signing an automatically located .changes
     file if none was passed on the command line (Closes: #468761)
+  * debchange: Apply a more elegant fix for the bugfix in 2.10.18.
+    Thanks to gregor herrmann for pointing the obvious solution out.
 
  -- Adam D. Barratt <[EMAIL PROTECTED]>  Sat, 01 Mar 2008 11:42:02 +0000
 

Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl  2008-03-01 11:54:04 UTC (rev 1089)
+++ trunk/scripts/debchange.pl  2008-03-01 11:59:04 UTC (rev 1090)
@@ -792,20 +792,11 @@
     while(<S>) {
        last if /^ --/;
 
-       if (/^\s*$/) {
-           my $first = $_;
-           my $next = <S>;
-           if ($next !~ /^ --/) {
-               $CHANGES .= $first;
-           } else {
-               last;
-           }
-           $CHANGES .= $next;
-       } else {
-            $CHANGES .= $_;
-       }
+       $CHANGES .= $_;
     }
 
+    chomp $CHANGES;
+
     # Reset file pointer
     seek(S, 0, 0);
 }



-- 
To unsubscribe, send mail to [EMAIL PROTECTED]

Reply via email to