[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4-1-339-gbcbcb4c
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit f5adf881cdf1f23f6cc96dcbcd529f9385aeb70f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Dec 10 15:13:15 2012 +0100
use internal jfreereport and langtag, build full l10n
- use system jfreereport because of MIR troubles
- use internal langtag until the arm troubles are cleared
- build full l10n: it will be incomplete, but should show if there are troubles lurking there
- add lp-bug to changelog
diff --git a/changelog b/changelog
index a49eb51..35032ac 100644
--- a/changelog
+++ b/changelog
@@ -38,7 +38,7 @@ libreoffice (1:4.0.0~beta1~git20121204-1) UNRELEASED; urgency=low
libreoffice (1:4.0.0~alpha1-0ubuntu1~ppa2) quantal; urgency=low
- * reenable report-builder
+ * reenable report-builder (LP: #992232)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 24 Nov 2012 15:44:55 +0100
diff --git a/rules b/rules
index 8c48e4b..b9f54e2 100755
--- a/rules
+++ b/rules
@@ -497,6 +497,8 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
IMAGES+=human
CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
SYSTEM_STUFF := $(filter-out graphite orcus lpsolve, $(SYSTEM_STUFF))
+ # lp#1034560: MIR troubles make it easier to use internal jfreereport
+ SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
# lp#1026059 -- pure white is better for now
CONFIGURE_FLAGS += --with-intro-progressbar-color=255,255,255
# do not run checks on armel armhf powerpc for now as they fail with "debug output level 11 is too high"
@@ -505,9 +507,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
endif
PARALLEL_BUILD=y
#temp. hacks
- BUILD_ONLY_EN_US=y
ENABLE_EVO2:=n
ENABLE_MERGEDLIBS=y
+ SYSTEM_STUFF := $(filter-out liblangtag, $(SYSTEM_STUFF)) # using internal liblangtag for now -- debian reported armel troubles
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
endif
--
LibreOffice packaging repository
Reply to: