[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4-7-12-g454fe22
The following commit has been merged in the debian-experimental-3.5 branch:
commit 0e641d7224e25c3cc1081bf25ff53636967bc3c1
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 9 00:48:14 2012 +0200
update to 3.5.6 rc2
diff --git a/changelog b/changelog
index a6cc90b..ff4c965 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
-libreoffice (1:3.5.5-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.6~rc2-1) UNRELEASED; urgency=low
- * new upstream release
+ * new upstream release candidate
- caches fontconfig font substitutions (closes: #631308)
-- Rene Engelhard <rene@debian.org> Wed, 13 Jun 2012 19:25:17 +0200
diff --git a/patches/evolution-3.4.diff b/patches/evolution-3.4.diff
deleted file mode 100644
index 0e05330..0000000
--- a/patches/evolution-3.4.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/connectivity/source/drivers/evoab2/EApi.cxx-old 2012-06-18 18:24:12.964565099 +0200
-+++ b/connectivity/source/drivers/evoab2/EApi.cxx 2012-06-18 18:24:37.480686688 +0200
-@@ -33,6 +33,7 @@
- #define DECLARE_FN_POINTERS 1
- #include "EApi.h"
- static const char *eBookLibNames[] = {
-+ "libebook-1.2.so.13", // bumped again (evolution-3.4)
- "libebook-1.2.so.12", // bumped again
- "libebook-1.2.so.10", // bumped again
- "libebook-1.2.so.9", // evolution-2.8
diff --git a/patches/series b/patches/series
index b17f0ca..dddd8c8 100644
--- a/patches/series
+++ b/patches/series
@@ -32,5 +32,4 @@ gcc-4.4.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.diff
fix-Test-BigPtrArray-on-64bit-bigendian.diff
-evolution-3.4.diff
CVE-2012-2665-binfilter.diff
diff --git a/rules b/rules
index 4a30c15..bac7d48 100755
--- a/rules
+++ b/rules
@@ -69,9 +69,9 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.5.5.3
+lo_sources_ver=3.5.6.2
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.5.3 libreoffice-3.5.5.3
+# use ./g checkout -b tag-libreoffice-3.5.6.2 libreoffice-3.5.6.2
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
endif
--
LibreOffice packaging repository
Reply to: