r936 ./packages/openofficeorg/2.3/experimental: fix logic error preventing mozilla-openoffice.org having real content, oops
------------------------------------------------------------
revno: 936
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-11-06 13:52:34 +0100
message:
fix logic error preventing mozilla-openoffice.org having real content, oops
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-11-04 15:48:52 +0000
+++ b/changelog 2007-11-06 12:52:34 +0000
@@ -1,18 +1,20 @@
openoffice.org (1:2.3.0-4.5pre) experimental; urgency=low
* ooo-build
- - update (r10706)
+ - update (r10734)
- src: update GSIs from ftp.linux.cz: da km mk sl vi
* debian/rules:
- since 2.3.0 final we need --enable-dbus explicitely
- remove obsolete glitz build-dep
- reenable -gcj (closes: #449201) and bump build-dep on
java-gcj-compat-dev for this
+ - fix logic error preventing mozilla-openoffice.org having
+ real content, oops (closes: #449528)
* debian/control.in:
- XS-Vcs-* -> Vcs-*
- add a conflict against libicu38 (= 3.8~d01-1)
- -- Rene Engelhard <rene@debian.org> Sun, 04 Nov 2007 15:48:29 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 06 Nov 2007 13:45:33 +0100
openoffice.org (1:2.3.0-4) experimental; urgency=medium
=== modified file 'rules'
--- a/rules 2007-11-04 15:48:52 +0000
+++ b/rules 2007-11-06 12:52:34 +0000
@@ -237,10 +237,14 @@
# Mozilla plugin. Crashes on amd64
OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc
ifeq "$(BUILD_AMD64)" "y"
+ ifeq "$(ARCH)" "amd64"
PACKAGE_NPSOPLUGIN=n
+ endif
endif
ifeq "$(BUILD_PPC64)" "y"
+ ifeq "$(ARCH)" "ppc64"
PACKAGE_NPSOPLUGIN=n
+ endif
endif
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
Reply to: