[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.3-5-67-g57b978e
The following commit has been merged in the debian-experimental-3.6 branch:
commit 57b978ed1e87ae184a4c5cf5ad9fbd083996fa2b
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jun 1 19:34:51 2012 +0200
update to first alpha release
diff --git a/changelog b/changelog
index 47d2e61..138b70b 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
-libreoffice (1:3.6.0~alpha0~git20120527-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.0~alpha1-1) UNRELEASED; urgency=low
- * new upstream snapshot
+ * new upstream alpha release
- fixes splashscreen location in multi-monitor setups
(closes: #657444, #431473)
diff --git a/patches/split-binfilters-and-evo.diff b/patches/split-binfilters-and-evo.diff
index 0b46535..6a6098b 100644
--- a/patches/split-binfilters-and-evo.diff
+++ b/patches/split-binfilters-and-evo.diff
@@ -13,12 +13,12 @@
.IF "$(WITH_LDAP)" == "YES"
my_components += component/extensions/source/config/ldap/ldapbe2
.END
-@@ -355,10 +345,6 @@
- my_components += cmdmail
+@@ -394,10 +394,6 @@
+ my_components += component/shell/source/cmdmail/cmdmail
.END
-.IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != ""
--my_components += evoab
+-my_components += component/connectivity/source/drivers/evoab2/evoab
-.END
-
.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
@@ -85,17 +85,17 @@
$(MISC)/graphicfilter.xcd \
$(MISC)/impress.xcd \
$(MISC)/korea.xcd \
-@@ -317,8 +318,8 @@
+@@ -329,8 +329,8 @@
ERROR : unknown-GUIBASE
.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
--MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
+-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
-+MY_FILES_evoab += $(MY_MOD)/DataAccess/evoab2.xcu
++MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+MY_FILES_evoab += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
+ MY_DRIVERS += evoab
.END
.IF "$(SOLAR_JAVA)" == "TRUE"
- MY_FILES_main += \
--- libreoffice-3.5.0/postprocess/prj/d.lst-old 2011-12-20 11:39:36.000000000 +0000
+++ libreoffice-3.5.0/postprocess/prj/d.lst 2011-12-20 11:40:07.000000000 +0000
@@ -4,4 +4,7 @@
diff --git a/rules b/rules
index 4f9bf3a..3825312 100755
--- a/rules
+++ b/rules
@@ -69,7 +69,7 @@ USE_SOURCE_TARBALLS=n
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.5.3.2
+lo_sources_ver=libreoffice-3.5.98.1
# NOT in proper libreoffice-3-5 branch
# use ./g checkout -b tag-libreoffice-3.5.3.2 libreoffice-3.5.3.2
GIT_TAG=libreoffice-$(lo_sources_ver)
--
LibreOffice packaging repository
Reply to: