[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-2-16-gd826c50
The following commit has been merged in the master branch:
commit 05fec999a85dfff8b13a6e02523674642d2e2a38
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jan 29 17:12:06 2012 +0100
install technical.dic and debian templates into -l10n-ca, not -l10n-ca-xv
diff --git a/changelog b/changelog
index 48f8515..2df129b 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,7 @@ libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
* debian/libreoffice-sdbc-postgresql.preinst.in: cleanup to avoid dpkg
warnings, thanks Julian Gilbey (closes: #657530)
- -- Rene Engelhard <rene@debian.org> Sat, 28 Jan 2012 12:20:01 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 29 Jan 2012 17:06:31 +0100
libreoffice (1:3.4.5-2) unstable; urgency=low
diff --git a/rules b/rules
index d04a469..0457590 100755
--- a/rules
+++ b/rules
@@ -2180,6 +2180,7 @@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/install $(STAMP_DIR)/install-indep $(OOO_BU
# install technical.dic
for iso in $(LANGPACKISOS); do \
if [ "$$iso" = "en-US" ]; then pkg=common; else pkg=l10n-`echo $$iso | tr A-Z a-z`; fi; \
+ if [ "$$iso" = "ca-XV" ]; then pkg=l10n-ca; else pkg=l10n-`echo $$iso | tr A-Z a-z`; fi; \
mkdir -p $(PKGDIR)-$$pkg/$(OODIR)/share/wordbook/$$iso; \
install -m644 $(SOURCE_TREE)/extras/source/wordbook/technical.dic \
$(PKGDIR)-$$pkg/$(OODIR)/share/wordbook/$$iso/technical.dic; \
@@ -2199,6 +2200,7 @@ ifeq "$(DIST)" "Debian"
for iso in $(LANGPACKISOS); do \
[ "$$iso" = "en-US" ] && continue; \
pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
+ [ "$$pkgiso" = "ca-xv"] && pkgiso=ca; \
mkdir -p $(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt; \
for otp in $$otps; do \
ln -sf ../../en-US/presnt/$$otp \
--
LibreOffice packaging repository
Reply to: