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: [PATCH] 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>).

---
 debian/changelog | 8 ++++++++
 dgit             | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a6729c6c..3ecbbdbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dgit (0.17~experimental4) experimental; urgency=low
+
+  * 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 (0.17~experimental3) experimental; urgency=low
 
   Minor fix to remote functionality:
diff --git a/dgit b/dgit
index 37a61111..441114db 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: $!";
-- 
2.30.2