The following commit has been merged in the ubuntu-natty-3.3.1-l10n branch:
commit 1265950d336f85916e4bd268aa68955453626307
Author: Bjoern Michaelsen <[email protected]>
Date: Tue Jul 5 18:54:44 2011 +0200
fix l10n merge error
diff --git a/rules b/rules
index 109056f..0c28b3b 100755
--- a/rules
+++ b/rules
@@ -2077,13 +2077,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
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
