[libreoffice] 01/01: add gnupg B-D for the tests (libgpgmepp only recommends it now)

Rene Engelhard rene at moszumanska.debian.org
Thu Dec 7 23:01:13 UTC 2017


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 04e489ff6a156ea147e9ef6f1d6db00ebba7fd08
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Dec 7 23:09:54 2017 +0100

    add gnupg B-D for the tests (libgpgmepp only recommends it now)
---
 changelog | 2 +-
 control   | 1 +
 rules     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 089d6a3..388b2ea 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~beta2~git20171208-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta2~git20171207-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/control b/control
index 0903eba..e9ab59b 100644
--- a/control
+++ b/control
@@ -36,6 +36,7 @@ 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,
                hunspell-en-us [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
diff --git a/rules b/rules
index a1f7b73..a559335 100755
--- a/rules
+++ b/rules
@@ -1551,6 +1551,7 @@ endif
 ifneq (,$(filter gpgmepp, $(SYSTEM_STUFF)))
 	BUILD_DEPS+= , libgpgmepp-dev, libgpgme-dev, libgpg-error-dev
 endif
+	BUILD_DEPS+= , gnupg <!nocheck>
 
 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



More information about the Pkg-openoffice-commits mailing list