Re: pre-approval of OOo 3.2.1-8 with fix for #572535
On Sun, Nov 14, 2010 at 09:45:14PM +0100, Rene Engelhard wrote:
> Please unblock.
Gah, scratch that. I had a file there which wasnt supposed to be there from
just the packages' contents from my testing - and so we don#t have the actual
template there but just loads of dangling symlinks.
Will upload a -9 with the following:
=== modified file 'changelog'
--- changelog 2010-11-14 20:47:55 +0000
+++ changelog 2010-11-14 22:32:01 +0000
@@ -1,3 +1,9 @@
+openoffice.org (1:3.2.1-9) unstable; urgency=low
+
+ * debian/rules: actually install debian-presentation.odp to -common...
+
+ -- Rene Engelhard <rene@debian.org> Sun, 14 Nov 2010 23:31:19 +0100
+
openoffice.org (1:3.2.1-8) unstable; urgency=medium
* debian/patches/set-correct-default-formula-syntax.diff: backport
=== modified file 'rules'
--- rules 2010-11-09 21:54:51 +0000
+++ rules 2010-11-14 22:33:46 +0000
@@ -3421,6 +3421,12 @@
| sed -e "s,\@OOBASISDIR\@,$(OOBASISDIR)," \
> $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs
+ifeq "$(DIST)" "Debian"
+ # install Debian presentation template
+ mkdir -p $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt
+ install -m644 debian/templates/*.otp $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/
+endif
+
# add "openoffice.org" symlink
cd $(PKGDIR)-common/usr/bin && ln -s ooffice openoffice.org$(VER)
Sorry again.
Grüße/Regards,
René
--
.''`. René Engelhard -- Debian GNU/Linux Developer
: :' : http://www.debian.org | http://people.debian.org/~rene/
`. `' rene@debian.org | GnuPG-Key ID: D03E3E70
`- Fingerprint: E12D EA46 7506 70CF A960 801D 0AA0 4571 D03E 3E70
Reply to: