[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-43-gd0db175
The following commit has been merged in the debian-experimental-4.0 branch:
commit d0db175720d91b9ef8d30225ca520311afff66dd
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 12 16:27:11 2013 +0100
4.0.2 rc1
diff --git a/changelog b/changelog
index 3aee903..f8dfdb2 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.1~rc2-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.2~rc1-1) UNRELEASED; urgency=low
* new upstream release candidate
diff --git a/patches/series b/patches/series
index e3d48e5..ebe4ebf 100644
--- a/patches/series
+++ b/patches/series
@@ -27,4 +27,3 @@ 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
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
diff --git a/rules b/rules
index 69c43b9..5136234 100755
--- a/rules
+++ b/rules
@@ -68,7 +68,7 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=4.0.1.2
+lo_sources_ver=4.0.2.1
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)-hotfixes1
--
LibreOffice packaging repository
Reply to: