[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-2-10-g5ff7922
The following commit has been merged in the master branch:
commit e328a7f0803ff9437f1e81f5ad54e8064458d81c
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jan 28 12:17:45 2012 +0100
enable ca-XV, put into --{l10n,help}-ca
diff --git a/changelog b/changelog
index b48bdef..f2b66d5 100644
--- a/changelog
+++ b/changelog
@@ -3,10 +3,11 @@ libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
* debian/rules:
- install full changelog only for packages with the same name in OOo
times; strip pre-libreoffice entries otherwise.
+ - enable ca-XV, put into --{l10n,help}-ca
* ext-sources/ext-sources/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz:
add missing file which should have been in updated .orig-ext-sources..
- -- Rene Engelhard <rene@debian.org> Thu, 26 Jan 2012 00:43:45 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 27 Jan 2012 21:35:33 +0000
libreoffice (1:3.4.5-2) unstable; urgency=low
diff --git a/rules b/rules
index 8154253..d04a469 100755
--- a/rules
+++ b/rules
@@ -688,16 +688,16 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
# one to that gid_Module_Root always is english and the other langpacks
# have gid_Module_Root.$iso
#ISOS=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
- ISOS:=en-US af ar as ast be bg bn br bs ca cs cy da de dz el \
+ ISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
#HELPISOS:=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
- HELPISOS:=en-US ca cs da de dz el en-GB es et eu fi fr gl hi hu it \
+ HELPISOS:=en-US ca ca-XV cs da de dz el en-GB es et eu fi fr gl hi hu it \
ja km ko nl om pl pt pt-BR ru sk sl sv zh-CN zh-TW
#LANGPACKISOS:=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
- LANGPACKISOS:=en-US af ar as ast be bg bn br bs ca cs cy da de dz el \
+ LANGPACKISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
@@ -1437,6 +1437,7 @@ endif
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
[ "$$LNUM" = en-US -a "$(PKGSOURCE)" = "libreoffice$(VER)-l10n" ] && continue; \
+ [ "$$LNUM" = ca-XV ] && continue; \
LNAME=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
LCODE=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
@@ -1501,6 +1502,7 @@ endif
ifneq "$(HELPISOS)" ""
for LNUM in $(HELPISOS) ; do \
+ [ "$$LNUM" = ca-XV ] && continue; \
LNAME=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
LCODE=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
@@ -1926,6 +1928,18 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
cat debian/libreoffice-l10n-en-US.install >> debian/libreoffice-common.install
rm -f debian/libreoffice-l10n-en-US.dirs debian/libreoffice-l10n-en-US.install
+ # and ca-XV in -ca...
+ifeq (ca-XV,$(findstring ca-XV,$(LANGPACKISOS)))
+ cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs
+ cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install
+ rm -f debian/libreoffice-l10n-ca-XV.dirs debian/libreoffice-l10n-ca-XV.install
+endif
+ifeq (ca-XV,$(findstring ca-XV,$(HELPISOS)))
+ cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs
+ cat debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install
+ rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install
+endif
+
# fixup case (-l10n-pt-BR -> l10n-pt-br etc.)
for iso in $(ISOS); do \
pkgiso=`echo $$iso | tr A-Z a-z`; \
--
LibreOffice packaging repository
Reply to: