[libreoffice] 01/01: gnupg -> gpg

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 9f8207e6362fddb9f1c5a0dc95e6d729f4ffbc05
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 8 01:35:09 2017 +0100

    gnupg -> gpg
---
 control | 2 +-
 rules   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/control b/control
index 18131cb..0b5e6a3 100644
--- a/control
+++ b/control
@@ -36,9 +36,9 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                gcc (>= 4:7) [m68k],
                gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
-               gnupg <!nocheck>,
                gobject-introspection (>= 1.32.0),
                gperf,
+               gpg <!nocheck>,
                hunspell-en-us [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                java-common (>= 0.49),
diff --git a/rules b/rules
index 78ac8a9..ce62ef7 100755
--- a/rules
+++ b/rules
@@ -1551,7 +1551,11 @@ endif
 ifneq (,$(filter gpgmepp, $(SYSTEM_STUFF)))
 	BUILD_DEPS+= , libgpgmepp-dev, libgpgme-dev, libgpg-error-dev
 endif
+ifeq "$(STRETCH_BACKPORT)" "y"
 	BUILD_DEPS+= , gnupg <!nocheck>
+else
+	BUILD_DEPS+= , gpg <!nocheck>
+endif
 
 ifeq "$(ENABLE_GIO)" "y"
   ifneq "$(BUILD_GTK3)" "y"

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