------------------------------------------------------------
revno: 2195 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Sun 2010-11-14 23:49:48 +0100
message:
merge
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-11-14 21:03:06 +0000
+++ b/changelog 2010-11-14 22:49:48 +0000
@@ -1,3 +1,10 @@
+libreoffice (1:3.3.0~beta3-2) UNRELEASED; urgency=low
+
+ * debian/rules: actually install debian-presentation.odp to -common...
+ (really closes: #602043)
+
+ -- Rene Engelhard <r...@debian.org> Sun, 14 Nov 2010 23:31:19 +0100
+
libreoffice (1:3.3.0~beta3-1) experimental; urgency=low
* LibreOffice 3.3 beta3
=== modified file 'rules'
--- a/rules 2010-11-13 21:18:49 +0000
+++ b/rules 2010-11-14 22:49:48 +0000
@@ -3431,6 +3431,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 "libreoffice" symlink
cd $(PKGDIR)-common/usr/bin && ln -s ooffice libreoffice$(VER)
