r800 ./packages/openofficeorg/2.2.1/unstable: disable mozilla plugin for amd64 (merged from 2.3)
------------------------------------------------------------
revno: 800
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2007-10-19 19:01:40 +0200
message:
disable mozilla plugin for amd64 (merged from 2.3)
modified:
changelog
control.mozilla.in
rules
=== modified file 'changelog'
--- a/changelog 2007-10-19 16:53:34 +0000
+++ b/changelog 2007-10-19 17:01:40 +0000
@@ -8,6 +8,10 @@
- debian/rules:
+ build-depend on lib32icu36 on amd64 when using ICU 3.6 to work around
#447275
+ - debian/control.in:
+ + remove long obsolete debconf depends; we don't use debconf anymore
+ - debian/control.moztilla.in, debian/rules:
+ + don't build mozilla-openoffice.org on amd64/ppc64, broken
-- Rene Engelhard <rene@debian.org> Sun, 16 Sep 2007 00:42:19 +0200
=== modified file 'control.mozilla.in'
--- a/control.mozilla.in 2007-07-01 20:20:14 +0000
+++ b/control.mozilla.in 2007-10-19 17:01:40 +0000
@@ -1,6 +1,6 @@
Package: mozilla-openoffice.orgVER
Section: net
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_NPSOPLUGIN_ARCHS%
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
=== modified file 'rules'
--- a/rules 2007-10-19 16:51:49 +0000
+++ b/rules 2007-10-19 17:01:40 +0000
@@ -220,6 +220,14 @@
ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
+# Mozilla plugin. Crashes on amd64
+OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc
+ifeq "$(BUILD_AMD64)" "y"
+ PACKAGE_NPSOPLUGIN=n
+endif
+ifeq "$(BUILD_PPC64)" "y"
+ PACKAGE_NPSOPLUGIN=n
+endif
# Changes for 64 bit build
ifeq "$(ARCH)" "amd64"
@@ -983,6 +991,7 @@
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
ifeq "$(PACKAGE_QUICKSTART)" "y"
perl -pi -e 's#\(Widgets, Dialogs\)#\(Widgets, Dialogs, Quickstarter\)#' debian/control
Reply to: