------------------------------------------------------------
revno: 873
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2007-09-01 18:20:30 +0200
message:
update ooo-build; update GSIs; update to m3
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-08-31 23:19:39 +0000
+++ b/changelog 2007-09-01 16:20:30 +0000
@@ -1,7 +1,8 @@
-openoffice.org (1:2.3.0~oog680m2-1.2pre) experimental; urgency=low
+openoffice.org (1:2.3.0~rc1-0.1pre) experimental; urgency=low
+ * OpenOffice.org 2.3.0rc1 (OOG680_m3)
* ooo-build:
- - update (10137)
+ - update (r10186)
+ jvmfwk-gij-paths.diff: update for new gcj-4.2 packages
+ jawt-check-cleanup.diff: clenup jawt check to not expect -lgcj
(only needed with long obsolete libgcjawt). As we now only
@@ -9,6 +10,9 @@
and don't have a dependency on a specific gcj lib anymore we
can just depend (or-ed) on all supported JDKs.
Indirectly closes: #439287
+ + ooo80816.selinux.bridges.diff: add patch from Fedora to make OOo
+ work under SELinux (closes: #440105)
+ + src/: update GSIs from ftp.linux.cz: bg cs eo et fi mk vi
* debian/README.Debian: mention myspell-hy, myspell-fa, hunspell-ar
* debian/rules:
- BUILD_JARS_NATIVE=n until gcj-4.2 is unbroken
@@ -17,8 +21,10 @@
java-gcj-compat on sid
- (build-)depend on libhsqldb-java (>= 1.8.0.8-1)
- don't run dh_icons on etch backports
-
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 31 Aug 2007 22:05:28 +0200
+ - remove PATH setting for icu tools, now handled by configure
+ - remove $(PATCHSET)64 handling, obsolete
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 1 Sep 2007 18:17:53 +0200
openoffice.org (1:2.3.0~oog680m2-1) experimental; urgency=medium
=== modified file 'rules'
--- a/rules 2007-08-31 23:27:11 +0000
+++ b/rules 2007-09-01 16:20:30 +0000
@@ -54,10 +54,10 @@
SRCNUM=680
MWS=OOG680
# 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=m2
+MILESTONE=m3
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-2-3
@@ -236,14 +236,6 @@
ENABLE_MONO=n
endif
-# Changes for 64 bit build
-ifeq "$(ARCH)" "amd64"
- PATCHSET:=$(PATCHSET)64
-endif
-ifeq "$(ARCH)" "ppc64"
- PATCHSET:=$(PATCHSET)64
-endif
-
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
CC_PREFIX=sparc-linux-gnu-
@@ -548,8 +540,6 @@
# 34 and 36 provide this and 38 changed the real name.
BUILD_DEPS += , libicu-dev [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-icu
- # ICU utils are in /usr/sbin (!)
- PATH := $(PATH):/usr/sbin
endif
ifeq "$(USE_LIBXSLT)" "y"
@@ -820,7 +810,6 @@
set -e; \
cd ooo-build ;\
rm -rf \
- buildbot \
scratch/buildbot \
scratch/offapi-vba/constants/constant_types.rdb \
src/*.ico \
@@ -841,7 +830,7 @@
-o -name '*.odp' -o -name "*.ods" -o -name '*.odt' \
-o -name '*.png' -o -name '*.ppt' -o -name '*.sx?' \
-o -name '*.wb2' -o -name '*.WB2' -o -name '*.xls' \
- -o -name '*.XLS' -o -name '*.xlsx' \) \
+ -o -name '*.XLS' -o -name '*.xlsx' -o -name '*.xls.gz'
\) \
-exec rm {} \; ;\
fi
find ooo-build/scratch ooo-build/src -type f \
@@ -878,8 +867,6 @@
set -e; \
cd ooo-build ; \
for f in \
- buildbot/buildbot-source/buildbot/*.png \
- buildbot/buildbot-source/docs/PyCon-2003/*.png \
desktop/*/*.png \
doc/*.ods \
doc/*.sxw \
@@ -905,6 +892,7 @@
test/draw/*.sxd \
test/excel/*.xls \
test/excel/*.xlsx \
+ test/excel/*.xls.gz \
test/lotus/*.123 \
test/macro/*.ods \
test/macro/*.xls \
