[Pkg-gnupg-commit] [gnupg2] 11/20: rename gnupg-agent to gpg-agent

[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 a098ed6f25bdc8f9cfdf451560204322c9911d14
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Jul 26 09:02:16 2017 -0400

    rename gnupg-agent to gpg-agent
    
    There is no binary or any program named "gnupg-agent".  AFAICT, this
    package has always had an inconvenient name that people were required
    to remember despite it not being used anywhere.
    
    Renaming the package to match the binary and the systemd user service
    makes things saner for the long term.
---
 debian/control                                     | 34 +++++++++++++++++-----
 debian/{gnupg-agent.NEWS => gpg-agent.NEWS}        |  0
 ...agent.README.Debian => gpg-agent.README.Debian} |  0
 .../{gnupg-agent.examples => gpg-agent.examples}   |  0
 debian/{gnupg-agent.install => gpg-agent.install}  |  0
 debian/{gnupg-agent.links => gpg-agent.links}      |  0
 ...ore.server => gpg-agent.logcheck.ignore.server} |  0
 .../{gnupg-agent.manpages => gpg-agent.manpages}   |  0
 8 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 66ae3a8..7704b3d 100644
--- a/debian/control
+++ b/debian/control
@@ -64,6 +64,22 @@ Description: GNU privacy guard - core configuration utilities
  per-user daemons (if installed), etc.
 
 Package: gnupg-agent
+Architecture: all
+Section: oldlibs
+Priority: extra
+Multi-Arch: foreign
+Depends:
+ gpg-agent (>= ${source:Version}),
+ ${misc:Depends},
+Description: GNU privacy guard - cryptographic agent (dummy transitional package)
+ 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
+ with the proposed OpenPGP Internet standard as described in RFC4880.
+ .
+ This is a dummy transitional package; please use gpg-agent instead.
+
+Package: gpg-agent
 Architecture: any
 Multi-Arch: foreign
 Depends:
@@ -78,8 +94,12 @@ Suggests:
  libpam-systemd,
  pinentry-gnome3,
  scdaemon,
+Replaces:
+ gnupg-agent (<< 2.1.21-4),
+Breaks:
+ gnupg-agent (<< 2.1.21-4),
 Provides:
- gpg-agent,
+ gnupg-agent,
 Description: GNU privacy guard - cryptographic agent
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -140,11 +160,11 @@ Package: scdaemon
 Architecture: any
 Multi-Arch: foreign
 Depends:
- gnupg-agent (= ${binary:Version}),
+ gpg-agent (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Enhances:
- gnupg-agent,
+ gpg-agent,
 Description: GNU privacy guard - smart card support
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -152,13 +172,13 @@ Description: GNU privacy guard - smart card support
  with the proposed OpenPGP Internet standard as described in RFC4880.
  .
  This package contains the smart card program scdaemon, which is used
- by gnupg-agent to access OpenPGP smart cards.
+ by gpg-agent to access OpenPGP smart cards.
 
 Package: gpgsm
 Architecture: any
 Multi-Arch: foreign
 Depends:
- gnupg-agent (= ${binary:Version}),
+ gpg-agent (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -181,8 +201,8 @@ Package: gnupg
 Architecture: any
 Multi-Arch: foreign
 Depends:
- gnupg-agent (= ${binary:Version}),
  gnupg-utils (= ${binary:Version}),
+ gpg-agent (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
@@ -406,8 +426,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- gnupg-agent,
  gnupg,
+ gpg-agent,
  gpgconf,
  gpgsm,
 Description: GNU privacy guard - utility programs
diff --git a/debian/gnupg-agent.NEWS b/debian/gpg-agent.NEWS
similarity index 100%
rename from debian/gnupg-agent.NEWS
rename to debian/gpg-agent.NEWS
diff --git a/debian/gnupg-agent.README.Debian b/debian/gpg-agent.README.Debian
similarity index 100%
rename from debian/gnupg-agent.README.Debian
rename to debian/gpg-agent.README.Debian
diff --git a/debian/gnupg-agent.examples b/debian/gpg-agent.examples
similarity index 100%
rename from debian/gnupg-agent.examples
rename to debian/gpg-agent.examples
diff --git a/debian/gnupg-agent.install b/debian/gpg-agent.install
similarity index 100%
rename from debian/gnupg-agent.install
rename to debian/gpg-agent.install
diff --git a/debian/gnupg-agent.links b/debian/gpg-agent.links
similarity index 100%
rename from debian/gnupg-agent.links
rename to debian/gpg-agent.links
diff --git a/debian/gnupg-agent.logcheck.ignore.server b/debian/gpg-agent.logcheck.ignore.server
similarity index 100%
rename from debian/gnupg-agent.logcheck.ignore.server
rename to debian/gpg-agent.logcheck.ignore.server
diff --git a/debian/gnupg-agent.manpages b/debian/gpg-agent.manpages
similarity index 100%
rename from debian/gnupg-agent.manpages
rename to debian/gpg-agent.manpages

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