[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc2-1-247-g4a8546f
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 4a8546fc3fb5026f2a82586e7981b6f94f6b0a7e
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 3 20:42:16 2013 +0200
enable liblangtag on arm*, too now that it's available there
Conflicts:
changelog
control
diff --git a/rules b/rules
index 81fde0c..72f2cf0 100755
--- a/rules
+++ b/rules
@@ -594,12 +594,6 @@ endif
ifeq "$(DEB_HOST_ARCH)" "armel"
ENABLE_GRAPHITE=n
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
-ENABLE_LIBLANGTAG=n
-SYSTEM_STUFF := $(filter-out liblangtag, $(SYSTEM_STUFF))
-endif
-ifeq "$(DEB_HOST_ARCH)" "armhf"
-ENABLE_LIBLANGTAG=n
-SYSTEM_STUFF := $(filter-out liblangtag, $(SYSTEM_STUFF))
endif
ifeq "$(DEB_HOST_ARCH)" "sparc"
ENABLE_GRAPHITE=n
@@ -1051,7 +1045,7 @@ endif
ifeq ($(ENABLE_LIBLANGTAG),y)
ifneq (,$(filter liblangtag, $(SYSTEM_STUFF)))
- BUILD_DEPS += , liblangtag-dev (>= 0.4) [!armel !armhf]
+ BUILD_DEPS += , liblangtag-dev (>= 0.4)
endif
else
CONFIGURE_FLAGS += --disable-liblangtag
--
LibreOffice packaging repository
Reply to: