[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-177-g132031d
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 9a743e6455c62cc555f277bfbe898557141dba8a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 27 17:18:14 2013 +0100
we need libcmis 0.3.1
Conflicts:
control
patches/series
diff --git a/patches/series b/patches/series
index 1b70da4..5ac0849 100644
--- a/patches/series
+++ b/patches/series
@@ -27,5 +27,6 @@ build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
wheezy-backports-python.diff
+we-need-libcmis-0.3.1.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
lp-780399-sessioninstaller-for-remaining-java-wizards.diff
diff --git a/patches/we-need-libcmis-0.3.1.diff b/patches/we-need-libcmis-0.3.1.diff
new file mode 100644
index 0000000..6bd8ab2
--- /dev/null
+++ b/patches/we-need-libcmis-0.3.1.diff
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index bc36fc1..03140d2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6957,7 +6957,7 @@ AC_MSG_CHECKING([which libcmis to use])
+ if test "$with_system_libcmis" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LIBCMIS=YES
+- PKG_CHECK_MODULES( CMIS, libcmis-0.3 >= 0.3.0 )
++ PKG_CHECK_MODULES( CMIS, libcmis-0.3 >= 0.3.1 )
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_LIBCMIS=NO
diff --git a/rules b/rules
index 79fd37c..ad74f79 100755
--- a/rules
+++ b/rules
@@ -1003,7 +1003,7 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
BUILD_DEPS += , libmspub-dev
endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libcmis-dev (>= 0.3.0)
+ BUILD_DEPS += , libcmis-dev (>= 0.3.1)
endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
--
LibreOffice packaging repository
Reply to: