[libreoffice] 01/02: add conditional for dconf
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit b80966714e5319906e88f48b7ea88e7456c472dc
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 21 21:17:17 2015 +0200
add conditional for dconf
---
changelog | 2 +-
control | 2 ++
rules | 7 +++++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 7cce600..36c4a82 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.0~alpha1~git20150811-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~alpha1~git20150817-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/control b/control
index 3624a36..54b3624 100644
--- a/control
+++ b/control
@@ -53,6 +53,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64eb],
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
+ libdconf-dev,
libe-book-dev (>= 0.1.1),
libebook1.2-dev,
libeot-dev,
@@ -4402,6 +4403,7 @@ Depends: ant (>= 1.7.0),
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
+ libdconf-dev,
libe-book-dev (>= 0.1.1),
libebook1.2-dev,
libeot-dev,
diff --git a/rules b/rules
index e4c2c47..4351e47 100755
--- a/rules
+++ b/rules
@@ -380,6 +380,7 @@ ENABLE_EVO2=y
ENABLE_GVFS=n
ENABLE_GCONF=y
ENABLE_GIO=y
+ENABLE_DCONF=y
ENABLE_RANDR=y
SYSTEM_STUFF += npapi-headers
PACKAGE_BASE=y
@@ -1457,6 +1458,12 @@ else
endif
BUILD_DEPS += , gettext
+ifeq "$(ENABLE_DCONF)" "y"
+ BUILD_DEPS += , libdconf-dev
+else
+ CONFIGURE_FLAGS += --disable-dconf
+endif
+
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
BUILD_DEPS_INDEP += , fontforge
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: