./packages/openofficeorg/3.0/experimental r1136: update to beta2 branch (BEB300), m1
------------------------------------------------------------
revno: 1136
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-07-02 00:09:08 +0200
message:
update to beta2 branch (BEB300), m1
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-06-30 23:38:01 +0000
+++ b/changelog 2008-07-01 22:09:08 +0000
@@ -1,13 +1,13 @@
-openoffice.org (1:3.0.0~dev300m21-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~beta2~beb300m1-0.1pre) experimental; urgency=low
- * OpenOffice 3.0.0 development milestone 21 (DEV300_m21)
+ * OpenOffice 3.0.0 beta2 milestone 1 (BEB300_m1)
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
- now properly complains about missing permissions when trying to write
to a read-only location (closes: #238906)
- fixes printing of handouts in grayscale mode (closes: #416309)
* ooo-build:
- - update (r12956)
+ - update (r13017)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -64,7 +64,7 @@
- s/cupsys/cups/
- remove xutils build-dep, nas was using xmkmf and it's long gone here
- -- Rene Engelhard <rene@debian.org> Sun, 22 Jun 2008 03:15:12 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 01 Jul 2008 21:52:36 +0200
openoffice.org (1:2.4.1-3.4pre) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-06-25 00:37:07 +0000
+++ b/rules 2008-07-01 22:09:08 +0000
@@ -61,8 +61,8 @@
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
unexport LS_COLORS
-MWS=DEV300
-MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
+MWS=BEB300
+MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f3 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
#MILESTONE=m1
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
@@ -1781,13 +1781,13 @@
# remove extra license files
for iso in `echo $(LANGPACKISOS) | tr A-Z a-z`; do \
rm -rf $(PKGDIR)-l10n-$$iso/$(OODIR)/licenses; \
- rm -rf $(PKGDIR)-l10n-$$iso/$(OODIR)/share/readme/LICENSE*; \
+ rm -f $(PKGDIR)-l10n-$$iso/$(OODIR)/share/readme/LICENSE*; \
done
# remove extra readme files
for iso in `echo $(LANGPACKISOS) | tr A-Z a-z`; do \
rm -rf $(PKGDIR)-l10n-$$iso/$(OODIR)/readmes; \
- rm -rf $(PKGDIR)-l10n-$$iso/$(OODIR)/share/readme/README*; \
+ rm -f $(PKGDIR)-l10n-$$iso/$(OODIR)/share/readme/README*; \
done
# remove empty help directories
@@ -2670,13 +2670,13 @@
endif
# remove extra license files
rm -rf $(PKGDIR)-commmon/$(OOBRANDDIR)/licenses
- rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/LICENSE*
- rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/THIRDPARTYLICENSEREADME.html
- rm -rf $(PKGDIR)-common/$(OOBRANDIR)/LICENSE.html
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/LICENSE*
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/THIRDPARTYLICENSEREADME.html
+ rm -f $(PKGDIR)-common/$(OOBRANDIR)/LICENSE.html
# remove extra readme files
rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/readmes
- rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/README*
+ rm -f $(PKGDIR)-common/$(OOBRANDDIR)/share/readme/README*
# install Ximian desktop icons
for r in 16x16 22x22 24x24 32x32 48x48; do \
Reply to: