[Pkg-gnupg-commit] [gnupg2] 18/20: More tweaks to the package dependency graph

[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 b8caec8ddd19f96e6925ad00ee64f3e15d2ec4ec
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Jul 26 13:22:53 2017 -0400

    More tweaks to the package dependency graph
    
    We want most packages to Recommend: the full GnuPG suite (that's the
    default installation), and we want to ensure that individual packages
    are visible for their specific use cases.
---
 debian/control | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 49860ce..09c3c27 100644
--- a/debian/control
+++ b/debian/control
@@ -89,7 +89,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg (= ${binary:Version}) | gpgsm,
+ gnupg (= ${binary:Version}),
+ ${shlibs:Recommends},
 Suggests:
  dbus-user-session,
  libpam-systemd,
@@ -110,15 +111,21 @@ Description: GNU privacy guard - cryptographic agent
  This package contains the agent program gpg-agent which handles all
  secret key material for OpenPGP and S/MIME use.  The agent also
  provides a passphrase cache, which is used by pre-2.1 versions of
- GnuPG for OpenPGP operations.
+ GnuPG for OpenPGP operations.  Without this package, trying to do
+ secret-key operations with any part of the modern GnuPG suite will
+ fail.
 
 Package: gpg-wks-server
 Architecture: any
 Multi-Arch: foreign
 Depends:
- gnupg (= ${binary:Version}),
+ gpg-agent (= ${binary:Version}),
+ gpg (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
+Recommends:
+ gnupg (= ${binary:Version}),
+ ${shlibs:Recommends},
 Description: GNU privacy guard - Web Key Service server
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -139,9 +146,13 @@ Architecture: any
 Multi-Arch: foreign
 Depends:
  dirmngr (= ${binary:Version}),
- gnupg (= ${binary:Version}),
+ gpg-agent (= ${binary:Version}),
+ gpg (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
+Recommends:
+ gnupg (= ${binary:Version}),
+ ${shlibs:Recommends},
 Description: GNU privacy guard - Web Key Service client
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -179,11 +190,12 @@ Package: gpgsm
 Architecture: any
 Multi-Arch: foreign
 Depends:
- gpg-agent (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
+ gpgconf (= ${binary:Version}),
 Recommends:
- dirmngr (= ${binary:Version}),
+ gnupg (= ${binary:Version}),
+ ${shlibs:Recommends},
 Breaks:
  gnupg2 (<< 2.1.10-2),
 Replaces:
@@ -207,6 +219,7 @@ Depends:
  gpgconf (= ${binary:Version}),
 Recommends:
  gnupg (= ${binary:Version}),
+ ${shlibs:Recommends},
 Breaks:
  gnupg (<< 2.1.21-4),
 Replaces:
@@ -231,6 +244,8 @@ Depends:
  gnupg-l10n (= ${source:Version}),
  gnupg-utils (= ${binary:Version}),
  gpg-agent (= ${binary:Version}),
+ gpg-wks-client (= ${binary:Version}),
+ gpg-wks-server (= ${binary:Version}),
  gpg (= ${binary:Version}),
  gpgsm (= ${binary:Version}),
  gpgv (= ${binary:Version}),
@@ -334,7 +349,7 @@ Recommends:
  gnupg (= ${binary:Version}),
  ${shlibs:Recommends},
 Enhances:
- gnupg,
+ gpg,
  gpgsm,
  squid,
 Breaks:
@@ -356,7 +371,8 @@ Description: GNU privacy guard - network certificate management service
  access.
  .
  dirmngr is used for network access by gpg, gpgsm, and dirmngr-client,
- among other tools.
+ among other tools.  Unless this package is installed, the parts of
+ the GnuPG suite that try to interact with the network will fail.
 
 Package: gpgv-udeb
 Package-Type: udeb
@@ -425,7 +441,9 @@ Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Enhances:
- gnupg,
+ dirmngr,
+ gpg-agent,
+ gpg,
 Breaks:
  gnupg (<< 2.1.14-2~),
  gnupg2 (<< 2.1.14-2~),
@@ -455,8 +473,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg,
  gpg-agent,
+ gpg,
  gpgconf,
  gpgsm,
 Description: GNU privacy guard - utility programs

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