------------------------------------------------------------
revno: 1017
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-03-06 16:28:40 +0100
message:
rc3; only force gcc 4.3 for s390
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-03-05 11:23:49 +0000
+++ b/changelog 2008-03-06 15:28:40 +0000
@@ -1,14 +1,15 @@
-openoffice.org (1:2.4.0~rc2-1.2pre) unstable; urgency=low
+openoffice.org (1:2.4.0~rc3-0.1pre) unstable; urgency=low
+ * OpenOffice.org 2.4.0 rc3 (aka OOH680_m9)
* ooo-build
- - update (r11807)
+ - update (r11825)
* debian/rules:
- enable s390 build (don't enable mono); force gcc 4.3 to workaround
ICE(s)
* debian/control.in:
- build-depend on libxtst-dev
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 05 Mar 2008 12:20:51 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 06 Mar 2008 15:49:22 +0100
openoffice.org (1:2.4.0~rc2-1) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-03-05 11:23:49 +0000
+++ b/rules 2008-03-06 15:28:40 +0000
@@ -58,7 +58,7 @@
#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=m8
+MILESTONE=m9
#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-2-4
@@ -323,8 +323,10 @@
endif
ifeq (s390,$(findstring s390,$(OOO_ARCHS)))
BUILD_DEPS += , g++-4.3 [s390], gcc-4.3 [s390]
+ ifeq "$(ARCH)" "s390"
# 4.2 ICEs
GCC_VERSION := 4.3
+ endif
endif
OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel arm armel s390
