./packages/openofficeorg/3.0/experimental r1256: update to m6, ooo-build, GSIs
------------------------------------------------------------
revno: 1256
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-09-18 08:23:42 +0200
message:
update to m6, ooo-build, GSIs
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.158
committer: Rene Engelhard <rene.engelhard@1und1.de>
branch nick: unstable
timestamp: Thu 2008-09-04 15:58:11 +0200
message:
chmod 755 senddoc
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.159
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2008-09-16 23:05:43 +0200
message:
-9
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-09-15 12:20:37 +0000
+++ b/changelog 2008-09-18 06:23:42 +0000
@@ -1,12 +1,16 @@
-openoffice.org (1:3.0.0~rc1-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~rc2~m6-0.1pre) experimental; urgency=low
- * OpenOffice.org 3.0 release candidate 1 (OOO300_m5)
+ * OpenOffice.org 3.0 release branch milestone 6 (OOO300_m6)
- 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 (r13820)
+ - update (r13926)
+ - really fixes ppc/openjdk build
+ - math-draw-generic-name.diff: add GenericName for
+ Draw (closes: #498922) and Math (closes: #498924)
+ - src: update GSIs
* debian/rules:
- fix USE_SCSOLVER conditional
- reenable hu
@@ -22,7 +26,7 @@
* debian/shlibs.override.icu: update for OOo 3.0s icu 3.6
* debian/openoffice.org-presentation-minimizer.preinst.in: oops, $1 -> $2
- -- Rene Engelhard <rene@debian.org> Sat, 06 Sep 2008 16:07:00 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 17 Sep 2008 22:38:59 +0200
openoffice.org (1:3.0.0~ooo300m3-3) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-09-15 12:20:37 +0000
+++ b/rules 2008-09-18 06:23:42 +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=m5
+MILESTONE=m6
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-3-0
@@ -2429,17 +2429,22 @@
rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
done
- # move rpt stuff into -report-builder
+ifneq "$(ENABLE_REPORTDESIGN)" "y"
+ # unneeded. a no-Java arch, so the report-builder can't work anyway.
+ # (and we need to remove it here anyway as it otherwise would end up
+ # in -base)
+ rm -f $(PKGDIR)-base/$(OODIR)/program/librpt*
+else
+ # move rpt stuff into -report-builder-bin
+ rm -rf $(PKGDIR)-report-builder
rm -rf $(PKGDIR)-report-builder-bin
mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
$(PKGDIR)-report-builder-bin/$(OODIR)/program
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
- rm -rf $(PKGDIR)-report-builder
ifeq "$(ENABLE_JAVA)" "y"
- # install this; we need to register this ourselved later in
- # the maintainer scripts. This is intended upstream (**rpt* stuff
- # in 2.3 and the actual report builde as an extension, without which
+ # install this; we need to register this ourselves later in
+ # the maintainer scripts. This is intended upstream (*rpt* stuff
+ # in OOo and the actual report builder as an extension, without which
# the *rpt* stuff is a no-op.
install -D -m644 $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
$(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extension/install/sun-report-builder.oxt
Reply to: