[Pkg-gnupg-commit] [gnupg2] 05/16: renaming packages

[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 7ed59faa59271bc0cdf773de2e90af428f43baed
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Feb 17 19:09:57 2016 -0500

    renaming packages
---
 debian/control                             | 18 +++++++++---------
 debian/{gnupg2.docs => gnupg.docs}         |  0
 debian/{gnupg2.examples => gnupg.examples} |  0
 debian/{gnupg2.info => gnupg.info}         |  0
 debian/{gnupg2.install => gnupg.install}   |  0
 debian/{gnupg2.manpages => gnupg.manpages} |  0
 debian/{gpgv2.install => gpgv.install}     |  0
 debian/{gpgv2.manpages => gpgv.manpages}   |  0
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 45972e7..a46b91a 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Package: gnupg-agent
 Architecture: any
 Multi-Arch: foreign
 Depends: pinentry-curses | pinentry, ${misc:Depends}, ${shlibs:Depends}
-Recommends: gnupg2 | gpgsm | gnupg
+Recommends: gnupg (= ${binary:Version}) | gnupg2 | gpgsm
 Conflicts: newpg
 Replaces: gnupg2 (<< 2.0.18-2), gpgsm (<< 2.0.18-2), newpg
 Breaks: gnupg2 (<< 2.0.18-2), gpgsm (<< 2.0.18-2)
@@ -91,7 +91,7 @@ Description: GNU privacy guard - S/MIME version
  digital encryption and signing services on X.509 certificates and the
  CMS protocol. gpgsm includes complete certificate management.
 
-Package: gnupg2
+Package: gnupg
 Architecture: any
 Multi-Arch: foreign
 Depends: dpkg (>= 1.15.4) | install-info,
@@ -102,7 +102,7 @@ Recommends: dirmngr (>= 2.1.0~), ${shlibs:Recommends}
 Suggests: gnupg-doc, parcimonie, xloadimage
 Conflicts: gpg-idea (<= 2.2)
 Breaks: dirmngr (<< 2.1.0~)
-Description: GNU privacy guard - a free PGP replacement (new v2.x)
+Description: GNU privacy guard - a free PGP replacement
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
  It includes an advanced key management facility and is compliant
@@ -111,18 +111,18 @@ Description: GNU privacy guard - a free PGP replacement (new v2.x)
  GnuPG 2.x is the new modularized version of GnuPG supporting OpenPGP
  and S/MIME.
 
-Package: gpgv2
+Package: gpgv
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: gnupg2 (<< 2.0.21-2)
 Replaces: gnupg2 (<< 2.0.21-2)
-Suggests: gnupg2
-Description: GNU privacy guard - signature verification tool (new v2.x)
+Suggests: gnupg
+Description: GNU privacy guard - signature verification tool
  GnuPG is GNU's tool for secure communication and data storage.
  .
- gpgv2 is actually a stripped-down version of gpg2 which is only able
- to check signatures. It is somewhat smaller than the fully-blown gpg2
+ gpgv is actually a stripped-down version of gpg which is only able
+ to check signatures. It is somewhat smaller than the fully-blown gpg
  and uses a different (and simpler) way to check that the public keys
  used to make the signature are valid. There are no configuration
  files and only a few options are implemented.
@@ -131,7 +131,7 @@ Package: dirmngr
 Architecture: any
 Depends: adduser, lsb-base (>= 3.2-13), ${misc:Depends}, ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
-Enhances: gnupg2, gpgsm, squid
+Enhances: gnupg, gpgsm, squid
 Breaks: gnupg2 (<< 2.1.10-2)
 Replaces: gnupg2 (<< 2.1.10-2)
 Description: server for managing certificate revocation lists
diff --git a/debian/gnupg2.docs b/debian/gnupg.docs
similarity index 100%
rename from debian/gnupg2.docs
rename to debian/gnupg.docs
diff --git a/debian/gnupg2.examples b/debian/gnupg.examples
similarity index 100%
rename from debian/gnupg2.examples
rename to debian/gnupg.examples
diff --git a/debian/gnupg2.info b/debian/gnupg.info
similarity index 100%
rename from debian/gnupg2.info
rename to debian/gnupg.info
diff --git a/debian/gnupg2.install b/debian/gnupg.install
similarity index 100%
rename from debian/gnupg2.install
rename to debian/gnupg.install
diff --git a/debian/gnupg2.manpages b/debian/gnupg.manpages
similarity index 100%
rename from debian/gnupg2.manpages
rename to debian/gnupg.manpages
diff --git a/debian/gpgv2.install b/debian/gpgv.install
similarity index 100%
rename from debian/gpgv2.install
rename to debian/gpgv.install
diff --git a/debian/gpgv2.manpages b/debian/gpgv.manpages
similarity index 100%
rename from debian/gpgv2.manpages
rename to debian/gpgv.manpages

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