./packages/openofficeorg/2.4.1/unstable r1181: -9
------------------------------------------------------------
revno: 1181
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-04 13:58:11 +0000
+++ b/changelog 2008-09-16 21:05:43 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:2.4.1-8.9pre) unstable; urgency=medium
+openoffice.org (1:2.4.1-9) unstable; urgency=medium
* debian/control.reportdesign.in:
- -report-builder-bin contains librpt* which is linked against libraries
@@ -7,7 +7,7 @@
- fix senddoc fixing (add chmod 755) to keep senddoc executable
closes: #497618)
- -- Rene Engelhard <rene@debian.org> Wed, 4 Sep 2008 15:55:43 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 04 Sep 2008 19:03:26 +0200
openoffice.org (1:2.4.1-8) unstable; urgency=high
=== modified file 'rules'
--- a/rules 2008-09-04 13:58:11 +0000
+++ b/rules 2008-09-16 21:05:43 +0000
@@ -2250,17 +2250,22 @@
rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
done
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
- # 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_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)/reportdesign/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt
Reply to: