From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Jul 2015 21:53:52 +0000 (+0100)
Subject: When key to use not specified any other way, use the debian/changelog trailer line... 
X-Git-Tag: debian/1.1~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=99f7db251233b9f6fb735e775e5ceb18a46e066d;p=dgit.git

When key to use not specified any other way, use the debian/changelog trailer line.  Closes:#793423.
---

diff --git a/debian/changelog b/debian/changelog
index 3a54ce5d..34b9388e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ dgit (1.1~~) unstable; urgency=low
     or DEBEMAIL/DEBFULLNAME.  Closes:#793410.
   * Work around curl -sS -I printing `HTTP/1.0 200 Connection established'
     before the actual header, so dgit works with https_proxy set (!)
+  * When key to use not specified any other way, use the debian/changelog
+    trailer line.  Closes:#793423.
 
  --
 
diff --git a/dgit b/dgit
index 6226bceb..270f925a 100755
--- a/dgit
+++ b/dgit
@@ -1875,6 +1875,9 @@ END
 	if (!defined $keyid) {
 	    $keyid = access_cfg('keyid','RETURN-UNDEF');
 	}
+        if (!defined $keyid) {
+	    $keyid = getfield $clogp, 'Maintainer';
+        }
 	unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
 	my @sign_cmd = (@gpg, qw(--detach-sign --armor));
 	push @sign_cmd, qw(-u),$keyid if defined $keyid;
diff --git a/dgit.1 b/dgit.1
index e8f7eb23..dcf4408a 100644
--- a/dgit.1
+++ b/dgit.1
@@ -260,8 +260,8 @@ Use
 for signing the tag and the upload.  The default comes from the
 distro's
 .B keyid
-config setting (see CONFIGURATION, below), or failing that, gnupg's
-default.
+config setting (see CONFIGURATION, below), or failing that, the
+uploader trailer line in debian/changelog.
 .TP
 .BR --no-sign
 does not sign tags or uploads (meaningful only with push).