------------------------------------------------------------
revno: 1744
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2009-11-04 15:09:16 +0100
message:
+ - revert build-dep bump for armel, as it does not help as of latest
+ findings and the bug probably is in OOo..
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-11-04 09:48:33 +0000
+++ b/changelog 2009-11-04 14:09:16 +0000
@@ -3,6 +3,9 @@
* debian/po:
- add
- fi.po (thanks Esko Arajärvi, closes: #554031)
+ * debian/rules:
+ - revert build-dep bump for armel, as it does not help as of latest
+ findings and the bug probably is in OOo...
-- Rene Engelhard <[email protected]> Wed, 04 Nov 2009 10:44:35 +0100
=== modified file 'rules'
--- a/rules 2009-10-31 12:03:49 +0000
+++ b/rules 2009-11-04 14:09:16 +0000
@@ -464,11 +464,6 @@
ifeq (s390,$(findstring s390,$(OOO_ARCHS)))
BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390]
endif
-ifeq (armel,$(findstring armel,$(OOO_ARCHS)))
- ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d.
-f1,2)" "4.4"
- BUILD_DEPS += , binutils (>= 2.20) [armel], gcc-4.4 (>= 4.1.1-6)
[armel], g++-4.4 (>= 4.1.1-6) [armel]
- endif
-endif
OOO_MOZILLA_ARCHS=i386 powerpc mips mipsel s390 arm armel
ifeq "$(BUILD_AMD64)" "y"
