------------------------------------------------------------
revno: 1262
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-09-21 21:52:00 +0200
message:
m7/rc2
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-09-21 09:44:31 +0000
+++ b/changelog 2008-09-21 19:52:00 +0000
@@ -1,12 +1,12 @@
-openoffice.org (1:3.0.0~rc2~m6-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~rc2-0.1pre) experimental; urgency=high
- * OpenOffice.org 3.0 release branch milestone 6 (OOO300_m6)
+ * OpenOffice.org 3.0 release candidate 2 (OOO300_m7)
- catches exception on (malformed) ODGs referencing not existing
images (closes: #494644)
- makes -report-builder depend on 3.0 *exactly*.
* ooo-build:
- use ooo-build-3-0 branch
- - update (r13975)
+ - update (r13976)
- really fixes ppc/openjdk build
- math-draw-generic-name.diff: add GenericName for
Draw (closes: #498922) and Math (closes: #498924)
@@ -28,7 +28,7 @@
* debian/openoffice.org-presentation-minimizer.preinst.in: oops, fix version
comparison
- -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 20 Sep 2008 14:12:16 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 21 Sep 2008 20:43:06 +0200
openoffice.org (1:3.0.0~ooo300m3-3) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-09-21 09:44:31 +0000
+++ b/rules 2008-09-21 19:52:00 +0000
@@ -63,7 +63,7 @@
MWS=OOO300
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
-MILESTONE=m6
+MILESTONE=m7
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-3-0
@@ -3299,6 +3299,7 @@
wget http://download.go-oo.org/$(MWS)/$(TAG)-bootstrap.tar.bz2
&& \
wget http://download.go-oo.org/$(MWS)/$(TAG)-calc.tar.bz2 && \
wget http://download.go-oo.org/$(MWS)/$(TAG)-components.tar.bz2
&& \
+ wget http://download.go-oo.org/$(MWS)/$(TAG)-extensions.tar.bz2
&& \
wget http://download.go-oo.org/$(MWS)/$(TAG)-filters.tar.bz2 &&
\
wget http://download.go-oo.org/$(MWS)/$(TAG)-impress.tar.bz2 &&
\
wget http://download.go-oo.org/$(MWS)/$(TAG)-l10n.tar.bz2 && \
@@ -3311,7 +3312,6 @@
wget http://download.go-oo.org/$(MWS)/$(TAG)-testing.tar.bz2 &&
\
wget http://download.go-oo.org/$(MWS)/$(TAG)-ure.tar.bz2 && \
wget http://download.go-oo.org/$(MWS)/$(TAG)-writer.tar.bz2 && \
- wget http://download.go-oo.org/$(MWS)/$(TAG)-swext.tar.bz2 && \
tar xfvj $(TAG)-libs_extern_sys.tar.bz2 && \
for i in da_DK en_GB nl_NL ru_RU; do \
rm
$(TAG)-libs_extern_sys/dictionaries/$$i/hyph_$${i}.dic; \
