------------------------------------------------------------
revno: 1939
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2010-04-14 19:19:22 +0200
message:
fix OOO_BINFILTER_ARCHS
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-04-14 16:25:34 +0000
+++ b/changelog 2010-04-14 17:19:22 +0000
@@ -1,3 +1,11 @@
+openoffice.org (1:3.2.0-8) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix OOO_BINFILTER_ARCHS setting again. armel sneaked back in due to
+ thinko
+
+ -- Rene Engelhard <r...@debian.org> Wed, 14 Apr 2010 19:15:46 +0200
+
openoffice.org (1:3.2.0-7) unstable; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2010-04-13 13:31:32 +0000
+++ b/control 2010-04-14 17:19:22 +0000
@@ -439,7 +439,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
-Architecture: i386 m68k powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x
sparc
+Architecture: i386 powerpc s390 alpha amd64 hppa ia64 ppc64 s390x sparc
Pre-Depends: openoffice.org-common (>= 1:3.1.0-2), openoffice.org-core (>=
1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<<
1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org-core (<<
1:3.1.1~rc1-2), openoffice.org2-filter-so52, openoffice.org-filter-so52
=== modified file 'rules'
--- a/rules 2010-04-12 21:18:40 +0000
+++ b/rules 2010-04-14 17:19:22 +0000
@@ -508,8 +508,12 @@
ifneq (,$(findstring mips,$(ARCH)))
BUILD_BINFILTERS=n
endif
-OOO_BINFILTER_ARCHS=$(filter-out arm,$(filter-out armel,$(OOO_ARCHS)))
-OOO_BINFILTER_ARCHS=$(filter-out mips,$(filter-out mipsel,$(OOO_ARCHS)))
+ifneq (,$(findstring m68k,$(ARCH)))
+ BUILD_BINFILTERS=n
+endif
+OOO_BINFILTER_ARCHS:=$(filter-out arm,$(filter-out armel,$(OOO_ARCHS)))
+OOO_BINFILTER_ARCHS:=$(filter-out mips,$(filter-out
mipsel,$(OOO_BINFILTER_ARCHS)))
+OOO_BINFILTER_ARCHS:=$(filter-out m68k,$(OOO_BINFILTER_ARCHS))
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
