[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-255-g2a632dd
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 0c2783b609b8c850542b7bfc65ab409291efa3af
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Mar 15 12:55:51 2013 +0100
we need cmis 0.3.1 is upstreamed
diff --git a/patches/series b/patches/series
index 5c62cec..984035f 100644
--- a/patches/series
+++ b/patches/series
@@ -27,7 +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
fdo-35663.diff
diff --git a/patches/we-need-libcmis-0.3.1.diff b/patches/we-need-libcmis-0.3.1.diff
deleted file mode 100644
index 6bd8ab2..0000000
--- a/patches/we-need-libcmis-0.3.1.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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
--
LibreOffice packaging repository
Reply to: