[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.6.1_rc2-1-64-gaef91e7
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 2faad6d84ff71f0639d1680a742caef748f65761
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Aug 27 14:08:14 2012 +0200
waiting for the FFE for clucene lp#1042192
Conflicts:
changelog
diff --git a/changelog b/changelog
index 1eb47a0..19c7b23 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.6.1~rc2-1ubuntu1~ppa1) quantal; urgency=low
+
+ * merge from debian 3.6.1~rc2-1
+ * waiting for clucene FFE (lp#1042192)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 27 Aug 2012 14:07:45 +0200
+
libreoffice (1:3.6.1~rc2-1) experimental; urgency=low
* new upstream release candidate
diff --git a/rules b/rules
index 9cfcee1..f9e0e22 100755
--- a/rules
+++ b/rules
@@ -494,8 +494,8 @@ endif
ifeq "$(DEB_VENDOR)" "Ubuntu"
IMAGES+=human
CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
- # lucene has too heavy deps for main, internal copy does only build parts
- SYSTEM_STUFF := $(filter-out graphite libcdr libvisio lpsolve lucene, $(SYSTEM_STUFF))
+ # clucene, waiting for FFE: lp#1042192
+ SYSTEM_STUFF := $(filter-out graphite libcdr libvisio lpsolve clucene, $(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"
--
LibreOffice packaging repository
Reply to: