The following commit has been merged in the debian-experimental-3.5 branch:
commit e4e3933719d1fcd628eb41d6e11f77cde79c3330
Author: Rene Engelhard <r...@debian.org>
Date: Sun Jan 29 17:01:31 2012 +0100
install technical.dic and debian templates into -l10n-ca, not -l10n-ca-xv
diff --git a/changelog b/changelog
index 304b080..a6996c7 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,7 @@ libreoffice (1:3.5.0~rc2-2) UNRELEASED; urgency=low
- fix another merge error to really fix patch rule in check
- enable ca-XV, put into -{l10n,help}-ca
- -- Rene Engelhard <r...@debian.org> Sat, 28 Jan 2012 11:36:42 +0100
+ -- Rene Engelhard <r...@debian.org> Sun, 29 Jan 2012 17:00:47 +0100
libreoffice (1:3.5.0~rc2-1) experimental; urgency=low
diff --git a/rules b/rules
index 0e6ce89..7117493 100755
--- a/rules
+++ b/rules
@@ -1893,6 +1893,7 @@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/install
$(STAMP_DIR)/install-indep $(SOURCE
# 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; \
@@ -1912,6 +1913,7 @@ ifeq "$(DEB_VENDOR)" "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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rrxja-0002mh...@vasks.debian.org
