From 7ca3064a13b1fd2e541acc77ff11a3e6f4f8a970 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 24 Oct 2013 17:42:20 +0100
Subject: When using sbuild, pass the arguments to mergechanges in the right
 order so that we use the correct Description (the _source one, not the one
 from sbuild which didn't get e.g. -v<version>).

---
 dgit | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index 37a6111..441114d 100755
--- a/dgit
+++ b/dgit
@@ -1759,7 +1759,14 @@ sub cmd_sbuild {
 	}
     }
     runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
-    runcmd_ordryrun_local @mergechanges, glob $pat;
+    my @changesfiles = glob $pat;
+    @changesfiles = sort {
+	($b =~ m/_source\.changes$/ <=> $a =~ m/_source\.changes$/)
+	    or $a cmp $b
+    } @changesfiles;
+    fail "wrong number of different changes files (@changesfiles)"
+	unless @changesfiles;
+    runcmd_ordryrun_local @mergechanges, @changesfiles;
     my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
     if (act_local()) {
 	stat $multichanges or fail "$multichanges: $!";
-- 
cgit v1.2.3