r802 ./packages/openofficeorg/2.2.1/unstable: merge revisions 891 to 894 from 2.3
------------------------------------------------------------
revno: 802
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2007-10-19 19:10:31 +0200
message:
merge revisions 891 to 894 from 2.3
modified:
changelog
control.mono.in
rules
=== modified file 'changelog'
--- a/changelog 2007-10-19 17:04:56 +0000
+++ b/changelog 2007-10-19 17:10:31 +0000
@@ -9,10 +9,15 @@
+ migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS, the latter
is the quasi standard and will also be used by -j of the new
dpkg-buildpackage
+ + use LC_ALL=C instead of LANG=C for date call, else LC_ALL or LC_TIME
+ might override it.
+ + added mono-jit-dbg and mono-dbg to suggest list for debug packages
+ 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.mono.in:
+ + enhanced package description
- debian/control.moztilla.in, debian/rules:
+ don't build mozilla-openoffice.org on amd64/ppc64, broken
=== modified file 'control.mono.in'
--- a/control.mono.in 2007-03-01 09:45:40 +0000
+++ b/control.mono.in 2007-10-19 17:10:31 +0000
@@ -4,13 +4,13 @@
openoffice.orgVER-core (>> ${base-version}),
mono-gac,
${cli:Depends}
-Description: Mono binding for OpenOffice.org
+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 Mono (.net/CIL) bindings for OpenOffice.org for
- accessing the OpenOffice.org API via Mono/C#.
+ 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/C# for add-ins & scripting inside
+ Note that currently the use of Mono for add-ins & scripting inside
OpenOffice.org is *not* yet supported.
=== modified file 'rules'
--- a/rules 2007-10-19 17:04:56 +0000
+++ b/rules 2007-10-19 17:10:31 +0000
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
###################################################################################
-# OpenOffice.org source package rules flie
+# OpenOffice.org source package rules file
#
# Please see debian/README for detailed documentation about the build system, and
# how to build OpenOffice.org.
@@ -147,7 +147,7 @@
--mandir=/usr/share/man \
--with-docdir=/usr/share/doc/openoffice.org \
--with-lang="$(ISOS)" \
- --with-build-version="openoffice.org$(VER)-core $(BINARY_VERSION), `LANG=C date`" \
+ --with-build-version="openoffice.org$(VER)-core $(BINARY_VERSION), `LC_ALL=C date`" \
--disable-strip \
--enable-atkbridge \
--enable-lockdown
@@ -421,13 +421,14 @@
endif
ifeq "$(ENABLE_MONO)" "y"
- # gmcs for gmcs itself and mkbundle2 and -mcs for mcs itself and al.
+ # mono-gmcs for gmcs itself and mkbundle2
+ # mono-mcs for mcs itself and al.
BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)], cli-common-dev (>= 0.4.4) [$(OOO_MONO_ARCHS)]
# http://pkg-mono.alioth.debian.org/cli-policy/ch-mono.html#s7.3
MONO_SHARED_DIR = $(CURDIR)
export MONO_SHARED_DIR
CONFIGURE_FLAGS+= --enable-mono
- DBG_DBG_SUGGESTS += , libmono0-dbg [$(OOO_MONO_ARCHS)]
+ DBG_DBG_SUGGESTS += , mono-jit-dbg [$(OOO_MONO_ARCHS)], libmono0-dbg [$(OOO_MONO_ARCHS)], mono-dbg [$(OOO_MONO_ARCHS)]
else
CONFIGURE_FLAGS+= --disable-mono
endif
Reply to: