[Pkg-gnupg-commit] [gnupg2] 10/20: break out gnupg-utils package

[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 6fba69df481046ed310ba37b7006fcb5bdaed525
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Jul 26 08:51:40 2017 -0400

    break out gnupg-utils package
    
    This package contains all the associated utility programs; some people
    may want to use them indepdently of gpg itself, or may want to avoid
    having per-user daemons set up, etc.
---
 debian/control                                  | 36 ++++++++++++++++++-------
 debian/{gnupg.install => gnupg-utils.install}   |  1 -
 debian/{gnupg.manpages => gnupg-utils.manpages} |  1 -
 debian/gnupg.install                            |  9 -------
 debian/gnupg.manpages                           |  9 -------
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index 7bec76f..66ae3a8 100644
--- a/debian/control
+++ b/debian/control
@@ -182,6 +182,7 @@ Architecture: any
 Multi-Arch: foreign
 Depends:
  gnupg-agent (= ${binary:Version}),
+ gnupg-utils (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -213,8 +214,8 @@ Description: GNU privacy guard - a free PGP replacement
  It includes an advanced key management facility and is compliant
  with the proposed OpenPGP Internet standard as described in RFC4880.
  .
- This package contains /usr/bin/gpg and some helper utilities like
- gpgconf and kbxutil.
+ This package contains /usr/bin/gpg and depends on other useful
+ associated tools and utilities.
 
 Package: gnupg2
 Architecture: all
@@ -393,19 +394,36 @@ Description: GNU privacy guard - localization files
  This package contains the translation files for the use of GnuPG in
  non-English locales.
 
-Package: gpgcompose
+Package: gnupg-utils
 Architecture: any
 Priority: extra
 Multi-Arch: foreign
+Replaces:
+ gnupg (<< 2.1.21-4),
+Breaks:
+ gnupg (<< 2.1.21-4),
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg-agent, 
-Description: GNU privacy guard - experimental OpenPGP message composition tool
+ gnupg-agent,
+ gnupg,
+ gpgconf,
+ gpgsm,
+Description: GNU privacy guard - utility programs
  GnuPG is GNU's tool for secure communication and data storage.
  .
- gpgcompose is an experimental tool for constructing arbitrary
- sequences of OpenPGP packets.  This can be useful for generating
- weird constructs for test cases or other OpenPGP experimentation.
-
+ This package contains several useful utilities for manipulating
+ OpenPGP data and other related cryptographic elements.  It includes:
+ .
+ * addgnupghome -- create .gnupg home directories
+ * applygnupgdefaults -- run gpgconf --apply-defaults for all users
+ * gpgcompose -- an experimental tool for constructing arbitrary
+                 sequences of OpenPGP packets (e.g. for testing)
+ * gpgparsemail -- parse an e-mail message into annotated format
+ * gpgsplit -- split a sequence of OpenPGP packets into files
+ * gpg-zip -- encrypt or sign files in an archive
+ * kbxutil -- list, export, import Keybox data
+ * lspgpot -- convert PGP ownertrust values to GnuPG
+ * migrate-pubring-from-classic-gpg -- use only "modern" formats
+ * watchgnupg -- watch socket-based logs
diff --git a/debian/gnupg.install b/debian/gnupg-utils.install
similarity index 92%
copy from debian/gnupg.install
copy to debian/gnupg-utils.install
index d73b08f..c09178c 100644
--- a/debian/gnupg.install
+++ b/debian/gnupg-utils.install
@@ -1,7 +1,6 @@
 build/tools/gpg-zip usr/bin
 build/tools/gpgsplit usr/bin
 debian/migrate-pubring-from-classic-gpg usr/bin
-debian/tmp/usr/bin/gpg
 debian/tmp/usr/bin/gpgparsemail
 debian/tmp/usr/bin/kbxutil
 debian/tmp/usr/bin/watchgnupg
diff --git a/debian/gnupg.manpages b/debian/gnupg-utils.manpages
similarity index 89%
copy from debian/gnupg.manpages
copy to debian/gnupg-utils.manpages
index edf2790..c1dbe58 100644
--- a/debian/gnupg.manpages
+++ b/debian/gnupg-utils.manpages
@@ -3,7 +3,6 @@ debian/gpgsplit.1
 debian/kbxutil.1
 debian/lspgpot.1
 debian/migrate-pubring-from-classic-gpg.1
-debian/tmp/usr/share/man/man1/gpg.1
 debian/tmp/usr/share/man/man1/gpgparsemail.1
 debian/tmp/usr/share/man/man1/watchgnupg.1
 debian/tmp/usr/share/man/man8/addgnupghome.8
diff --git a/debian/gnupg.install b/debian/gnupg.install
index d73b08f..0b53564 100644
--- a/debian/gnupg.install
+++ b/debian/gnupg.install
@@ -1,10 +1 @@
-build/tools/gpg-zip usr/bin
-build/tools/gpgsplit usr/bin
-debian/migrate-pubring-from-classic-gpg usr/bin
 debian/tmp/usr/bin/gpg
-debian/tmp/usr/bin/gpgparsemail
-debian/tmp/usr/bin/kbxutil
-debian/tmp/usr/bin/watchgnupg
-debian/tmp/usr/sbin/addgnupghome
-debian/tmp/usr/sbin/applygnupgdefaults
-tools/lspgpot usr/bin
diff --git a/debian/gnupg.manpages b/debian/gnupg.manpages
index edf2790..7c47415 100644
--- a/debian/gnupg.manpages
+++ b/debian/gnupg.manpages
@@ -1,10 +1 @@
-debian/gpg-zip.1
-debian/gpgsplit.1
-debian/kbxutil.1
-debian/lspgpot.1
-debian/migrate-pubring-from-classic-gpg.1
 debian/tmp/usr/share/man/man1/gpg.1
-debian/tmp/usr/share/man/man1/gpgparsemail.1
-debian/tmp/usr/share/man/man1/watchgnupg.1
-debian/tmp/usr/share/man/man8/addgnupghome.8
-debian/tmp/usr/share/man/man8/applygnupgdefaults.8

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