[libreoffice] 01/01: git update; orcus is mandatory now

[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 cf1a62a658e914248c2b08eae9f71c960dc00177
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 28 23:53:07 2016 +0100

    git update; orcus is mandatory now
---
 changelog |  6 ++++++
 rules     | 11 ++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/changelog b/changelog
index 4f1ce26..4f97210 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.4.0~alpha0~git20161128-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
+
 libreoffice (1:5.3.0~beta2~git20161128-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
diff --git a/rules b/rules
index c29af67..e094571 100755
--- a/rules
+++ b/rules
@@ -472,7 +472,6 @@ FAKEROOT_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/libfakeroot
 ENABLE_TELEPATHY=n
 ENABLE_LIBLANGTAG=y
 SYSTEM_STUFF += liblangtag
-ENABLE_ORCUS=y
 SYSTEM_STUFF += orcus
 LIBORCUS_MINVER=0.12
 USE_UCPP=y
@@ -1065,10 +1064,8 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
   ifneq "$(BOOST_VERSION)" "default"
 	BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-date-time$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-iostreams$(BOOST_VERSION)-dev, libboost$(BOOST_VERSION)-filesystem-dev
 	#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev, libboost-program-options$(BOOST_VERSION)-dev
-    ifeq "$(ENABLE_ORCUS)" "y"
-      ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
+    ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-iostreams$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-program-options$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-filesystem$(BOOST_VERSION)-dev $(BOOST_MINVER)
-      endif
     endif
     ifeq ($(USE_VLC),y)
 	BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER)
@@ -1092,12 +1089,8 @@ ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libmdds-dev (>= 1.2)
 endif
 
-ifeq "$(ENABLE_ORCUS)" "y"
-  ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
+ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , liborcus-dev (>= $(LIBORCUS_MINVER))
-  endif
-else
-	CONFIGURE_FLAGS += --disable-orcus
 endif
 
 ifneq (,$(filter clucene, $(SYSTEM_STUFF)))

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