------------------------------------------------------------
revno: 1726
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Fri 2009-12-04 18:28:59 +0100
message:
update ooo-build and remove help symlink workaround
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-12-04 00:35:53 +0000
+++ b/changelog 2009-12-04 17:28:59 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:3.2.0~ooo320m6-2) UNRELEASED; urgency=low
* ooo-build
- - update (3bbc1bcd0aa7fa73a536345d68b77affca3df6ac)
+ - update (3aa8b1cf5e2668038591073635fe127cba4cb78e)
- makes "Always allow saving of document" configurable (closes: #478130)
- src: add OOO320 GSIs from ftp.linux.cz
=== modified file 'rules'
--- a/rules 2009-12-04 00:35:53 +0000
+++ b/rules 2009-12-04 17:28:59 +0000
@@ -3187,8 +3187,6 @@
$(PKGDIR)-common/$(OOBASISDIR)/share/registry/schema/org/openoffice/Office/Common.xcs
sed -i 's,$$(instpath)/help,/$(shell echo $(OODIR) | sed -e
s/lib/share/)/help,' \
$(PKGDIR)-common/$(OOBASISDIR)/share/registry/data/org/openoffice/Office/Paths.xcu
- # and let's work around a regression in m6 (i107283)...
- cd $(PKGDIR)-common/$(OODIR) && ln -s /$(shell echo $(OODIR) | sed -e
s/lib/share/)/help
# compat dirs, the split icons thing need it
mkdir -p $(PKGDIR)-common/$(shell echo $(OOBRANDDIR) | sed -e
s/lib/share/)/program
