./packages/openofficeorg/2.4.1/experimental r1113: update for m16 (rc1), mono builds for i386, just disable for amd64
------------------------------------------------------------
revno: 1113
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-26 22:33:31 +0200
message:
update for m16 (rc1), mono builds for i386, just disable for amd64
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-05-26 11:39:06 +0000
+++ b/changelog 2008-05-26 20:33:31 +0000
@@ -1,11 +1,11 @@
-openoffice.org (1:2.4.1~ooh680m15-0.1pre) experimental; urgency=low
+openoffice.org (1:2.4.1~rc1-0.1pre) experimental; urgency=low
- * OpenOffice.org 2.4.1 snapshot OOH680_m15
+ * OpenOffice.org 2.4.1 rc1 (OOH680_m16)
- now doesn't need a patched icu (public SetBreakType) anymore for
building
* ooo-build:
- use ooo-build-2-4-1 branch
- - update (r12662 - ooo-build 2.4.1)
+ - update (r12674 - ooo-build 2.4.1.1)
+ allows to change broken java configuration
This closes: #451928, #452925
Most probably also closes: #454996
@@ -15,14 +15,14 @@
- add get-orig-source target
- remove overseen $(OOO_ARCHS); make control/maintscripts depend on all
.ins for it (removes duplicate contro.gcj.in). Thanks Chris Cheney
- - temporarily disable mono
+ - disable mono on amd64
* debian/control.in:
- remove libicu build-conflicts
* debian/control.in, debian/rules:
- libsapdbc-java was removed, stop suggesting it and adding it to OOos
CLASSPATH
- -- Rene Engelhard <rene@debian.org> Mon, 26 May 2008 13:38:20 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 26 May 2008 22:20:06 +0200
openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-05-26 13:06:29 +0000
+++ b/control 2008-05-26 20:33:31 +0000
@@ -3019,6 +3019,19 @@
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
+Package: libuno-cil
+Architecture: i386 sparc ia64
+Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}), mono-gac, ${cli:Depends}
+Description: CLI binding for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the CLI bindings to OpenOffice.org for
+ accessing the OpenOffice.org API from Mono languages (e.g. C# and Boo)
+ .
+ Note that currently the use of Mono for add-ins & scripting inside
+ OpenOffice.org is *not* yet supported.
+
Package: openoffice.org-qa-tools
Section: devel
Priority: extra
=== modified file 'rules'
--- a/rules 2008-05-26 13:06:29 +0000
+++ b/rules 2008-05-26 20:33:31 +0000
@@ -58,10 +58,10 @@
SRCNUM=680
MWS=OOH680
# note that this only makes sense for ~oo?680s. as o < r (as rcX). src680 would break the ordering (s > r).
-MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
+#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
# For SRC680 milestones, use only ~mX
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2)
-#MILESTONE=m12
+MILESTONE=m16
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-2-4-1
@@ -95,7 +95,7 @@
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
-ENABLE_MONO=n
+ENABLE_MONO=y
MONO_MINVER= (>= 1.2.3)
USE_SYSTEM_HUNSPELL=y
HUNSPELL_MIN_VER= (>= 1.1.5-2)
@@ -292,9 +292,9 @@
# mono
# ppc fails (#412967), arm(el), too
OOO_MONO_ARCHS = i386 sparc
-ifeq "$(BUILD_AMD64)" "y"
- OOO_MONO_ARCHS += amd64
-endif
+#ifeq "$(BUILD_AMD64)" "y"
+# OOO_MONO_ARCHS += amd64
+#endif
ifeq "$(BUILD_IA64)" "y"
OOO_MONO_ARCHS += ia64
endif
Reply to: