------------------------------------------------------------
revno: 1676
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Mon 2009-10-19 19:59:41 +0200
message:
- work around the fact that this is a beta version but has no beta splash
but we're supposed to use the "Developer Snapshot" splash
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-10-18 21:54:53 +0000
+++ b/changelog 2009-10-19 17:59:41 +0000
@@ -15,7 +15,7 @@
- no duplicate shortcut in Insert Menu anymore (closes: #550510)
* ooo-build:
- - update (6fcfa1002f45902d0e877eb311ddb2bbc14948e2)
+ - update (8053787d68b28b93c2eabae8b02ed5cd885aa816)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -33,6 +33,8 @@
from cgit.freedesktop.org
- bump libboost-dev build-dep to >= 1.38
- for now, only build with en-US
+ - work around the fact that this is a beta version but has no beta splash
+ but we're supposed to use the "Developer Snapshot" splash
* debian/control.mediawiki.in:
- we don't need a strict depends on lucene anymore, remove it again.
Bump dependencies to >= 1:3.0.0~ matching description.xml
@@ -47,7 +49,7 @@
* debian/openoffice.org-filter-binfilter.{templates,postinst.in}:
- warn against those filters being obsoleted with OOo 3.4
- -- Rene Engelhard <[email protected]> Fri, 16 Oct 2009 19:34:38 +0200
+ -- Rene Engelhard <[email protected]> Mon, 19 Oct 2009 18:31:08 +0200
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-10-18 21:54:53 +0000
+++ b/rules 2009-10-19 17:59:41 +0000
@@ -2741,7 +2741,7 @@
for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/broffice.org/*.keys; do \
cat $$i >>
debian/broffice.org/usr/share/mime-info/openoffice.keys; \
done
- if dpkg-parsechangelog | grep urgency | grep -q "\~.*m[0123456789]\+";
then \
+ if dpkg-parsechangelog | grep urgency | egrep -q
"\~(.*m[0123456789]\+|beta)"; then \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.bmp \
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/intro.bmp; \
@@ -3109,7 +3109,7 @@
ifeq "$(DIST)" "Debian"
# fix intro
- if dpkg-parsechangelog | grep urgency | grep -q "\~.*m[0123456789]\+";
then \
+ if dpkg-parsechangelog | grep urgency | egrep -q
"\~(.*m[0123456789]\+|beta)"; then \
debian/scripts/fix_image_rgb \
$(SOURCE_TREE)/ooo_custom_images/dev_nologo/introabout/intro.bmp \
$(PKGDIR)-common/$(OOBRANDDIR)/program/intro.bmp; \
