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

[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 212dbf1098158b057a7c0c443387a473d7051df9



The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 212dbf1098158b057a7c0c443387a473d7051df9
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Tue Mar 1 21:56:07 2011 +0100

    we want lzma on all archs but armel, not the other way around

diff --git a/rules b/rules
index 739be1b..5b37ec4 100755
--- a/rules
+++ b/rules
@@ -508,9 +508,7 @@ ifeq "$(DIST)" "Ubuntu"
   endif
   PATCHSET=$(DIST)$(shell perl -e 'print ucfirst("$(DISTREL)");')
 
-  ifneq (,$(filter $(ARCH), armel))
-    USE_LZMA_COMPRESS=y
-  endif
+  USE_LZMA_COMPRESS=$(if $(filter-out armel,$(ARCH)),y,n)
 
   CONFIGURE_FLAGS += --with-openldap
   CONFIGURE_FLAGS += --with-system-python

-- 
LibreOffice packaging repository


Reply to: