From e4ff2dddf705d2025b5cf03d1af2ef9161ed54f4 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 22 Aug 2013 14:00:12 +0100
Subject: support _multi.changes

---
 dgit | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index eb263b1..d61cea7 100755
--- a/dgit
+++ b/dgit
@@ -772,12 +772,18 @@ sub dopush () {
     $dsc->{$ourdscfield} = rev_parse('HEAD');
     $dsc->save("../$dscfn.tmp") or die $!;
     if (!$changesfile) {
-	my $pat = "${package}_c$version_*.changes";
-	my @cs = glob "../$pat";
-	fail "failed to find unique changes file".
-	    " (looked for $pat in ..); perhaps you need to use dgit -C"
-	    unless @cs==1;
-	($changesfile) = @cs;
+	my $multi = "${package}_${cversion}_multi.changes";
+	if (stat $multi) {
+	    $changesfile = $multi;
+	} else {
+	    $!==&ENOENT or die "$multi: $!";
+	    my $pat = "${package}_${cversion}_*.changes";
+	    my @cs = glob "../$pat";
+	    fail "failed to find unique changes file".
+		" (looked for $pat in ..); perhaps you need to use dgit -C"
+		unless @cs==1;
+	    ($changesfile) = @cs;
+	}
     }
     my $tag = debiantag($dversion);
     if (!check_for_git()) {
-- 
cgit v1.2.3