When key to use not specified any other way, use the debian/changelog trailer line...

diff --git a/debian/changelog b/debian/changelog
index 3a54ce5da5410d643327903d85e33fbe3199f8d2..34b9388e93bcfcd0616142ac6ba3868db1538aa3 100644 (file)
--- 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 6226bceb930be542b3c5c892a12b8c377832a96a..270f925a56a6ededa7fbf17bf8c754d46b87d042 100755 (executable)
--- 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 e8f7eb233dab4bc976b46f6c1d9019dea3f778d5..dcf4408a4cccd38fec4d055db2d0225c73e0efad 100644 (file)
--- 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).