[libreoffice] 01/02: add conditional for new gpgme usage

[Rene Engelhard]

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

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

commit ab3d8f5c318864925e5a8410ce070e05bf3cb0e6
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Feb 2 13:41:52 2017 +0100

    add conditional for new gpgme usage
---
 changelog     | 2 +-
 control       | 1 +
 rules         | 5 +++++
 tests/control | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 664e6cb..acf586c 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20170130-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20170201-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/control b/control
index 1e186bd..17c0a05 100644
--- a/control
+++ b/control
@@ -75,6 +75,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libglib2.0-dev (>= 2.15.0),
                libglm-dev (>= 0.9.6.3),
                libgltf-dev (>= 0.1.0),
+               libgpgme-dev,
                libgraphite2-dev (>= 0.9.3),
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
diff --git a/rules b/rules
index 259178f..176116d 100755
--- a/rules
+++ b/rules
@@ -523,6 +523,7 @@ endif
 SYSTEM_STUFF += glm
 BUILD_PPC64EL=y
 BUILD_ARM64=y
+SYSTEM_STUFF += gpgme
 
 # Default flags to pass to configure
 CONFIGURE_FLAGS= \
@@ -1470,6 +1471,10 @@ ifneq (,$(filter glm, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libglm-dev (>= 0.9.6.3)
 endif
 
+ifneq (,$(filter gpgme, $(SYSTEM_STUFF)))
+	BUILD_DEPS += , libgpgme-dev
+endif
+
 ifeq "$(ENABLE_GIO)" "y"
 	BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
 else
diff --git a/tests/control b/tests/control
index 14e9ed2..13b54e8 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
 Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

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