[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc2-2-3-ga577c23
The following commit has been merged in the debian-experimental-4.0 branch:
commit 20bd07fe41abdfa5a3ec407fb3c95699c54d2843
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
diff --git a/changelog b/changelog
index f52914e..8a222df 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:4.0.2~rc2-3) UNRELEASED; urgency=low
* debian/control.librelogo.in:
- actually use ${pyuno-depends}...
+ * debian/rules:
+ - enable liblangtag on arm*, too now that it's available there
-- Rene Engelhard <rene@debian.org> Tue, 02 Apr 2013 12:39:08 +0200
diff --git a/control b/control
index 5abb5e1..0d23b03 100644
--- a/control
+++ b/control
@@ -60,7 +60,7 @@ Build-Depends: ant (>= 1.7.0),
libice-dev,
libicu-dev (>= 4.6),
libjpeg-dev,
- liblangtag-dev (>= 0.4) [!armel !armhf],
+ liblangtag-dev (>= 0.4),
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
diff --git a/rules b/rules
index e26528e..9710451 100755
--- a/rules
+++ b/rules
@@ -584,12 +584,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
@@ -1037,7 +1031,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: