[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.1-1-79-gd756c58
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit a86f5d3d842ca9110ed038fefaf403bef80d11ab
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Apr 3 00:38:35 2012 +0200
actually install the templates, not only the links
diff --git a/rules b/rules
index 0b797c9..e3d3e58 100755
--- a/rules
+++ b/rules
@@ -2597,10 +2597,10 @@ endif
mkdir -p $(OODIR)/share/dtd && \
cd $(OODIR)/share/dtd && ln -s /$(shell echo $(OODIR) | sed -e s/libreoffice/openoffice/)/share/dtd/officedocument
-ifeq "$(DEB_VENDOR)" "Debian"
+ifneq "$(VENDOR_PRESENTATION_TEMPLATES)" ""
# 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/
+ install -m644 debian/$(VENDOR_PRESENTATION_TEMPLATES)/*.otp $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/
endif
ifeq "$(PACKAGE_SDK)" "y"
--
LibreOffice packaging repository
Reply to: