The following commit has been merged in the master branch:
commit 3037d4bcf1b48ce50a7c9a6f04468a2aaeba7956
Author: James Vega <[email protected]>
Date:   Mon Aug 2 19:33:42 2010 -0400

    debcommit: Use the first detected changelog instead of the last.
    
    Closes: #591368
    Signed-off-by: James Vega <[email protected]>

diff --git a/debian/changelog b/debian/changelog
index 4178af9..4e64d6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+devscripts (2.10.67) UNRELEASED; urgency=low
+
+  * debcommit: Use the first detected changelog instead of the last.  (Closes:
+    #591368)
+
+ -- James Vega <[email protected]>  Mon, 02 Aug 2010 19:30:40 -0400
+
 devscripts (2.10.66) unstable; urgency=low
 
   [ James Vega ]
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 8555b8a..799aeb2 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -299,7 +299,10 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) {
 # Find a good default for the changelog file location
 
 for (qw"debian/changelog changelog") {
-    $changelog = $_ if -e ($_);
+    if (-e $_) {
+        $changelog = $_;
+        last;
+    }
 }
 
 # Now read the command line arguments

-- 
Git repository for devscripts


-- 
To unsubscribe, send mail to [email protected].

Reply via email to