[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-3-18-g28cc695
The following commit has been merged in the debian-experimental-3.5 branch:
commit 28cc69530d9d826ec555bc74fb8e9b1dd3f0f8d6
Author: Rene Engelhard <rene@debian.org>
Date: Sun Oct 2 23:43:56 2011 +0200
add conditional for new libcmis
diff --git a/changelog b/changelog
index 19e436c..9677c63 100644
--- a/changelog
+++ b/changelog
@@ -11,14 +11,14 @@ libreoffice (1:3.5.0~git20110928-1) UNRELEASED; urgency=low
- enable new build against Gtk3
- bump python b-d to >= 2.6 as we don't work with earlier anymore.
Also build python3-uno
- - add new conditionals and build-deps for new libvisio,librsvg,gettext
- usage and libexttextcat switch
+ - add new conditionals and build-deps for new libvisio,librsvg,gettext,
+ libcmis usage and libexttextcat switch
- run new "make check" instead of solenv/bin/subsequenttests
* debian/rules, debian/control.in:
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
- -- Rene Engelhard <rene@debian.org> Fri, 30 Sep 2011 02:56:18 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Oct 2011 21:23:16 +0000
libreoffice (1:3.4.3-3) unstable; urgency=low
diff --git a/rules b/rules
index b214ccb..8a3b693 100755
--- a/rules
+++ b/rules
@@ -962,6 +962,12 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libvisio, $(SYSTEM_STUFF)))
BUILD_DEPS += , libvisio-dev
endif
+ ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libcmis-dev
+ else
+ # workaround
+ BUILD_DEPS += , libboost-program-options-dev
+ endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
--
LibreOffice packaging repository
Reply to: