The following commit has been merged in the debian-experimental-3.5 branch:
commit f6acd44ba24120323b9fa18586356a5a9d03b8f6
Author: Rene Engelhard <r...@debian.org>
Date: Fri Feb 17 17:03:13 2012 +0100
remove 'icu on arm fails' check
diff --git a/changelog b/changelog
index 18efbe6..59cfa2f 100644
--- a/changelog
+++ b/changelog
@@ -5,9 +5,11 @@ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
Jani Monoses
* debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
remove, obsolete
+ * debian/patches/icu-arm.diff: fix internal icu build on arm.
* debian/rules:
- - fix cut'n'paste error in arm conditionals breaking the build
+ - remove obsolete (and buggy) conditional icu-on-arm-fails breaking
+ the build
[ Bjoern Michaelsen ]
* debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
diff --git a/rules b/rules
index 1a35e8e..cb40a54 100755
--- a/rules
+++ b/rules
@@ -351,9 +351,6 @@ ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
ifneq (stdlibs,$(findstring stdlibs,$(SYSTEM_STUFF)))
$(error sal does not build on arm with internal stdlibs!)
endif
- ifneq (icu,$(findstring icu,$(SYSTEM_STUFF)))
- $(error internal icu does nt build on arm!)
- endif
endif
OOO_64BIT_ARCHS = $(filter alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x,
$(OOO_ARCHS))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ryqhs-0000vc...@vasks.debian.org
