[X2Go-Commits] [x2go-keyring] 02/02: debian/control: depend on gnupg package only.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2go-keyring.

commit 90041e5cd81fa19c0c1c26de12f32ac399f273ce
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Aug 17 11:33:32 2019 +0200

    debian/control: depend on gnupg package only.
    
    Making sure that gnupg2 is getting installed unless such a package
    doesn't exist is too complicated.
    
    A dependency such as "gnupg2 | gnupg" sadly doesn't work, because gnupg
    is a base package and hence always installed, which immediately fulfils
    the dependency.
---
 debian/changelog | 5 +++++
 debian/control   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff4e935..cd6f0aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,11 @@ x2go-keyring (2019.08.04) UNRELEASED; urgency=medium
     - Add build-dependency on debhelper >= 7.
     - Bump up dh dependency to 9.
     - Make sure we pull in gnupg2 on older Debian versions.
+    - Depend on gnupg package only. Making sure that gnupg2 is getting
+      installed unless such a package doesn't exist is too complicated. A
+      dependency such as "gnupg2 | gnupg" sadly doesn't work, because gnupg is
+      a base package and hence always installed, which immediately fulfils the
+      dependency.
   * debian/rules:
     - Simplify file... a lot.
     - Don't use --no-parallel with dh commands in compat-9-mode.
diff --git a/debian/control b/debian/control
index 4a00854..66701f9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
  Mihai Moldovan <ionic at ionic.de>,
 Build-Depends:
-  gnupg2 | gnupg,
+  gnupg,
   jetring,
   bash,
   coreutils,
@@ -21,7 +21,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends:
   ${misc:Depends}
-Recommends: gnupg2 | gnupg
+Recommends: gnupg
 Description: GnuPG keys of all X2Go developers and the X2Go archive
  The Debian project requires developers to digitally sign the
  announcements of their packages with GnuPG, to protect against

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2go-keyring.git