[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 06/06: also fix debian-presentation.otp install for ca-valencia/kmr-latn



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 001c92fbf87af0a82d068207d9ceb408af1f1d45
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Sep 28 12:12:54 2014 +0200

    also fix debian-presentation.otp install for ca-valencia/kmr-latn
---
 changelog | 4 +++-
 rules     | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 4dd2106..8749d83 100644
--- a/changelog
+++ b/changelog
@@ -7,7 +7,9 @@ libreoffice (1:4.3.2-1) unstable; urgency=medium
   * debian/rules:
     - remove arm64 internal vigra workaround again; now built
     - remove obsolete libxml-parser-perl build-dep
-    - fix technical.dic install for kmr-Latn
+    - fix technical.dic install for kmr-Latn and debian-presentation.otp
+      install for kmr-Latn and ca-valencia so they end up in the correct
+      package and don't survive clean
 
   * merge from Ubuntu:
     - adding build-essential to subsequentcheckbase should fix autopkgtest
diff --git a/rules b/rules
index 0415e2f..3f0a305 100755
--- a/rules
+++ b/rules
@@ -2503,7 +2503,8 @@ ifeq "$(DEB_VENDOR)" "Debian"
 	for iso in $(LANGPACKISOS); do \
 	  [ "$$iso" = "en-US" ] && continue; \
 	  pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
-	  [ "$$pkgiso" = "ca-xv" ] && pkgiso=ca; \
+	  [ "$$pkgiso" = "ca-valencia" ] && pkgiso=ca; \
+	  [ "$$pkgiso" = "kmr-latn" ] && pkgiso=kmr; \
 	  mkdir -p $(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt; \
 	  for otp in $$otps; do \
 	    ln -sf ../../en-US/presnt/$$otp \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: