[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-143-g4d4f4d6



The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 542c70af32d5efeb4d96ea0917c81addd7e41086
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Dec 15 15:54:55 2011 +0100

    disable system lucene graphite libvisio lpsolve libcdr for now
    
    lp#938708: MIR lucene2
    
    lp#938709: MIR libcmis
    
    lp#938582: MIR libexttextcat
    
    lp#938712: MIR sampleicc

diff --git a/rules b/rules
index 2d7628b..41e2069 100755
--- a/rules
+++ b/rules
@@ -495,6 +495,11 @@ ifeq "$(WHEEZY_BACKPORT)" "y"
   SYSTEM_STUFF := $(filter-out libcmis libcdr clucene, $(SYSTEM_STUFF))
 endif
 
+ifeq "$(DEB_VENDOR)" "Ubuntu"
+  # lucene has too heavy deps for main, internal copy does only build parts
+  SYSTEM_STUFF := $(filter-out graphite libcdr libvisio lpsolve lucene, $(SYSTEM_STUFF))
+endif
+
 CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
 
 CC_PREFIX:=$(shell gcc -dumpmachine)-

-- 
LibreOffice packaging repository


Reply to: