[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0-2-57-gd596b0c
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit cdff80e88b016b74719af05da337f5466a7dd13c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Feb 24 13:26:42 2012 +0100
disable reportbuilder, disable system lucene
diff --git a/control.in b/control.in
index 7a7868e..5265f4d 100644
--- a/control.in
+++ b/control.in
@@ -58,7 +58,6 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-draw,
libreofficeVER-math,
libreofficeVER-base%OOO_NO_BASE_ARCHS%,
- libreofficeVER-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
ttf-dejavu,
ttf-sil-gentium-basic,
libreofficeVER-filter-mobiledev,
@@ -342,8 +341,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
libmysql-java | libpg-java | libjtds-java,
- libreofficeVER-gcj,
- libreofficeVER-report-builder
+ libreofficeVER-gcj
Replaces: openoffice.org-base (<< 1:3.3.0~rc3-2ubuntu3)
Description: office productivity suite -- database
LibreOffice is a full-featured office productivity suite that provides
diff --git a/rules b/rules
index b600ad2..bd170c7 100755
--- a/rules
+++ b/rules
@@ -460,6 +460,10 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
SYSTEM_STUFF := $(filter-out graphite libvisio lpsolve, $(SYSTEM_STUFF))
CONFIGURE_FLAGS += --with-intro-progressbar-color=221,72,20
+ # unfortunately way to heavy dependency-wise for main (via libloader)
+ ENABLE_REPORTDESIGN=n
+ # too heavy deps for main, internal copy does only build parts
+ SYSTEM_STUFF:=$(filter-out lucene,$(SYSTEM_STUFF))
# do not run checks on armel armhf powerpc for now as they fail with "debug output level 11 is too high"
ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
RUN_MAKE_CHECK:=n
--
LibreOffice packaging repository
Reply to: