[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. libreoffice_3.3.3-3-121-g37a2690
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 37a269087556b1bacdea25ce382f5e6659da1e1f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 5 18:54:44 2011 +0200
fix l10n merge error
diff --git a/rules b/rules
index 2d0daec..dce7f18 100755
--- a/rules
+++ b/rules
@@ -2088,13 +2088,13 @@ endif
# but the link is in -common so we need to do it here.
cd $(PKGDIR)-common/$(OOBASISDIR) && \
rm ure-link && ln -sf /$(OOUREDIR) ure-link
-endif # ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
ifeq "$(ENABLE_EVO2)" "y"
mkdir -p $(PKGDIR)-evolution/$(OODIR)/presets/database
mv $(PKGDIR)-common/$(OODIR)/presets/database/evolocal.odb \
$(PKGDIR)-evolution/$(OODIR)/presets/database
endif
+endif # ifeq "$(PKGSOURCE)" "libreoffice$(VER)"
find debian/tmp ! -perm -200 | xargs -r chmod u+w
--
LibreOffice packaging repository
Reply to: