[Pkg-gnupg-commit] [gnupg2] 12/20: move gpg-connect-agent into gpgconf

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit dd702f310d7fecb57c10e0ccab9f89c6636355fc
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Jul 26 09:21:30 2017 -0400

    move gpg-connect-agent into gpgconf
    
    /usr/bin/gpgconf itself wants to invoke gpg-connect-agent, and
    gpg-connect-agent is also important for use with both gpg-agent and
    dirmngr, so it makes more sense to place it in the base package.
---
 debian/control            | 2 ++
 debian/gpg-agent.install  | 1 -
 debian/gpg-agent.manpages | 1 -
 debian/gpgconf.install    | 1 +
 debian/gpgconf.manpages   | 1 +
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 7704b3d..f3d4587 100644
--- a/debian/control
+++ b/debian/control
@@ -52,8 +52,10 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Replaces:
+ gnupg-agent (<< 2.1.21-4),
  gnupg (<< 2.1.21-4),
 Breaks:
+ gnupg-agent (<< 2.1.21-4),
  gnupg (<< 2.1.21-4),
 Description: GNU privacy guard - core configuration utilities
  GnuPG is GNU's tool for secure communication and data storage.
diff --git a/debian/gpg-agent.install b/debian/gpg-agent.install
index 2a4dcbe..fc7e341 100644
--- a/debian/gpg-agent.install
+++ b/debian/gpg-agent.install
@@ -1,7 +1,6 @@
 debian/Xsession.d/90gpg-agent etc/X11/Xsession.d
 debian/systemd-user/gpg-agent-browser.socket usr/lib/systemd/user
 debian/tmp/usr/bin/gpg-agent
-debian/tmp/usr/bin/gpg-connect-agent
 debian/tmp/usr/bin/symcryptrun
 debian/tmp/usr/lib/gnupg/gpg-check-pattern
 debian/tmp/usr/lib/gnupg/gpg-preset-passphrase
diff --git a/debian/gpg-agent.manpages b/debian/gpg-agent.manpages
index 4819831..7284c09 100644
--- a/debian/gpg-agent.manpages
+++ b/debian/gpg-agent.manpages
@@ -1,5 +1,4 @@
 debian/gpg-check-pattern.1
 debian/tmp/usr/share/man/man1/gpg-agent.1
-debian/tmp/usr/share/man/man1/gpg-connect-agent.1
 debian/tmp/usr/share/man/man1/gpg-preset-passphrase.1
 debian/tmp/usr/share/man/man1/symcryptrun.1
diff --git a/debian/gpgconf.install b/debian/gpgconf.install
index 627c6e7..398d8a6 100644
--- a/debian/gpgconf.install
+++ b/debian/gpgconf.install
@@ -1,2 +1,3 @@
+debian/tmp/usr/bin/gpg-connect-agent
 debian/tmp/usr/bin/gpgconf
 debian/tmp/usr/share/gnupg/distsigkey.gpg
diff --git a/debian/gpgconf.manpages b/debian/gpgconf.manpages
index 058031e..70bb0d7 100644
--- a/debian/gpgconf.manpages
+++ b/debian/gpgconf.manpages
@@ -1 +1,2 @@
+debian/tmp/usr/share/man/man1/gpg-connect-agent.1
 debian/tmp/usr/share/man/man1/gpgconf.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git