------------------------------------------------------------
revno: 1131
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-06-12 22:41:15 +0200
message:
update ooo-build, close 477653, reenable mozilla plugin for 64bits; remove
obsolete comment (db4.6 4.6.21-9 in NEW makes -dev libdb4.6-dev)
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-06-12 02:04:00 +0000
+++ b/changelog 2008-06-12 20:41:15 +0000
@@ -1,3 +1,16 @@
+openoffice.org (1:2.4.1-2.3pre) unstable; urgency=medium
+
+ * ooo-build:
+ - update (r12875)
+ + cws-cmcfixes47-sw.diff: backport fix from 3.0 to not open Word
+ documents read-only (closes: #477653)
+ + cws-cmcfixes47-extensions.diff: fix mozilla plugin for 64-bit mozilla
+ API
+ * debian/rules:
+ + reenable mozilla plugin for 64bit archs
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 12 Jun 2008 22:33:40 +0200
+
openoffice.org (1:2.4.1-2) unstable; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2008-06-10 08:17:43 +0000
+++ b/control 2008-06-12 20:41:15 +0000
@@ -3066,7 +3066,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc sparc mips mipsel s390
+Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
=== modified file 'rules'
--- a/rules 2008-06-09 18:16:13 +0000
+++ b/rules 2008-06-12 20:41:15 +0000
@@ -310,23 +310,7 @@
endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
-# Mozilla plugin. Crashes on amd64
-OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc mips mipsel s390
-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 "$(BUILD_IA64)" "y"
- ifeq "$(ARCH)" "ia64"
- PACKAGE_NPSOPLUGIN=n
- endif
-endif
+OOO_NPSOPLUGIN_ARCHS = $(OOO_MOZILLA_ARCHS)
else
OOO_NPSOPLUGIN_ARCHS=
endif
@@ -396,7 +380,6 @@
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut
-d"." -f3,4,5)-dbg
endif
- # libdb-dev since 4.6 but it provides libdb4.6-dev, so keep this
as-is...
BUILD_DEPS += , libdb$(DBVER)-dev
ifneq "$(BUILD_DBG_PACKAGE)" "y"
