------------------------------------------------------------ revno: 1928 committer: Rene Engelhard <r...@debian.org> branch nick: unstable timestamp: Fri 2010-04-09 23:04:50 +0200 message: the mozilla plugin is broken on 64 bit archs; (temporarily) disable it on those until fixed modified: changelog control rules
=== modified file 'changelog' --- a/changelog 2010-04-09 20:51:01 +0000 +++ b/changelog 2010-04-09 21:04:50 +0000 @@ -16,9 +16,11 @@ - remove trailing ), breaking the libmysqlcppconn-dev build-dep on sparc - disable binfilter building on mips(el) like we do on arm(el) to save build time + - the mozilla plugin is broken on 64 bit archs; (temporarily) disable it + on those until fixed * debian/scripts/vars.s390x: add, we have S390X conditionals in rule after all - -- Rene Engelhard <r...@debian.org> Fri, 09 Apr 2010 22:48:39 +0200 + -- Rene Engelhard <r...@debian.org> Fri, 09 Apr 2010 23:02:59 +0200 openoffice.org (1:3.2.0-6) unstable; urgency=low
=== modified file 'control' --- a/control 2010-04-09 20:51:01 +0000 +++ b/control 2010-04-09 21:04:50 +0000 @@ -3441,7 +3441,7 @@ Package: mozilla-openoffice.org Section: net -Architecture: i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc +Architecture: i386 mips mipsel powerpc s390 armel hppa sparc Enhances: iceape-browser, iceweasel, mozilla-browser, === modified file 'rules' --- a/rules 2010-04-09 20:51:01 +0000 +++ b/rules 2010-04-09 21:04:50 +0000 @@ -399,9 +399,11 @@ OOO_ARCHS= i386 m68k mips mipsel powerpc s390 ifeq "$(BUILD_ALPHA)" "y" OOO_ARCHS += alpha + OOO_64BIT_ARCHS += alpha endif ifeq "$(BUILD_AMD64)" "y" OOO_ARCHS += amd64 + OOO_64BIT_ARCHS += amd64 endif ifeq "$(BUILD_ARMEL)" "y" OOO_ARCHS += armel @@ -411,12 +413,15 @@ endif ifeq "$(BUILD_IA64)" "y" OOO_ARCHS += ia64 + OOO_64BIT_ARCHS += ia64 endif ifeq "$(BUILD_PPC64)" "y" OOO_ARCHS += ppc64 + OOO_64BIT_ARCHS += ppc64 endif ifeq "$(BUILD_S390X)" "y" OOO_ARCHS += s390x + OOO_64BIT_ARCHS += s390x endif ifeq "$(BUILD_SPARC)" "y" OOO_ARCHS += sparc @@ -489,7 +494,7 @@ endif ifeq "$(PACKAGE_NPSOPLUGIN)" "y" -OOO_NPSOPLUGIN_ARCHS = $(OOO_MOZILLA_ARCHS) +OOO_NPSOPLUGIN_ARCHS = $(filter-out $(OOO_64BIT_ARCHS),$(OOO_MOZILLA_ARCHS)) else OOO_NPSOPLUGIN_ARCHS= endif @@ -520,6 +525,9 @@ endif endif +# Note that this does *NOT* only affect the mozilla plugin but also +# stuff like the xmlsecurity (which uses nss). For the plugin only, +# change the OOO_NPSOPLUGIN_ARCHS OOO_MOZILLA_ARCHS=i386 mips mipsel powerpc s390 ifeq "$(BUILD_ALPHA)" "y" OOO_MOZILLA_ARCHS += alpha