[libreoffice] 01/02: enable missed sr-Latn but merge into -sr

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit e127c43cbedc68676f99c6cc05c063163a83339c
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Nov 25 14:04:33 2017 +0100

    enable missed sr-Latn but merge into -sr
---
 changelog |  8 +++++---
 rules     | 20 +++++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index 80a4875..d180600 100644
--- a/changelog
+++ b/changelog
@@ -2,9 +2,11 @@ libreoffice (1:5.4.3-3) UNRELEASED; urgency=medium
 
   * debian/patches/icu-60.diff: backport icu 60 support patch from master
 
-  * debian/rules: replace some manual dpkg-parsechangelog calls with
-    $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
-    --disable-dependency-tracking
+  * debian/rules:
+    - replace some manual dpkg-parsechangelog calls with
+      $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
+      --disable-dependency-tracking
+    - enable missed sr-Latn but merge into -sr
   * debian/control.in:
     - clean up mozilla suggests to just firefox-esr | thunderbird | firefox
     - add versions to openjdk-{7,8}-jre-headless conflicts now that they are
diff --git a/rules b/rules
index 04bf204..77ef437 100755
--- a/rules
+++ b/rules
@@ -1007,7 +1007,7 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
 	ISOS:=en-US af am ar as ast be bg bn br bs ca ca-valencia cs cy da de dz el \
 	  en-GB en-ZA eo es et eu fa fi fr ga gd gl gu gug he hi hr hu id is it ja \
 	  ka kk km ko kmr-Latn 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 \
+	  pa-IN pl pt pt-BR ro ru rw si sk sl sr sr-Latn ss st sv \
 	  ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
     ifeq "$(ENABLE_HELP)" "n"
 	HELPISOS:=
@@ -1020,7 +1020,7 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
 	LANGPACKISOS:=en-US af am ar as ast be bg bn br bs ca ca-valencia cs cy da de dz el \
 	  en-GB en-ZA eo es et eu fa fi fr ga gd gl gu gug he hi hr hu id is it ja \
 	  ka kk km ko kmr-Latn 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 \
+	  pa-IN pl pt pt-BR ro ru rw si sk sl sr sr-Latn ss st sv \
 	  ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
   endif
 else
@@ -1712,6 +1712,7 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
 	    LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
 	    LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
 	    [ "$$LNUM" = ca-valencia ] && continue; \
+	    [ "$$LNUM" = sr-Latn ] && continue; \
 	    [ "$$LCODE" = kmr-latn ] && LCODE=kmr; \
 	    CCODE=`echo $$LCODE | sed 's/-.*//'`; \
 	    case "$$LCODE" in \
@@ -2173,8 +2174,19 @@ ifeq (ca-valencia,$(findstring ca-valencia,$(HELPISOS)))
 		rm -f debian/libreoffice-help-ca-valencia.dirs debian/libreoffice-help-ca-valencia.install; \
 	fi
 endif
+	# and sr-Latn should be in -sr
+ifeq (sr-Latn,$(findstring sr-Latn,$(LANGPACKISOS)))
+	if [ -f debian/libreoffice-l10n-sr-Latn.dirs -a -f debian/libreoffice-l10n-sr-Latn.install ]; then \
+		cat debian/libreoffice-l10n-sr-Latn.dirs >> debian/libreoffice-l10n-sr.dirs; \
+		cat debian/libreoffice-l10n-sr-Latn.install >> debian/libreoffice-l10n-sr.install; \
+		rm -f debian/libreoffice-l10n-sr-Latn.dirs debian/libreoffice-l10n-sr-Latn.install; \
+	fi
+endif
 
-	# should be in -kmr...
+	# This should be in -kmr... This is different like the above where
+	# we move different "variants" into the "base" but there's only kmr-Latn
+	# for Kurmanji, but I don't really want to have that -latn suffix in 
+	# the packages
 ifeq (kmr-Latn,$(findstring kmr-Latn,$(LANGPACKISOS)))
 	if [ -f debian/libreoffice-l10n-kmr-Latn.dirs -a -f debian/libreoffice-l10n-kmr-Latn.install ]; then \
 		cat debian/libreoffice-l10n-kmr-Latn.dirs >> debian/libreoffice-l10n-kmr.dirs; \
@@ -2587,6 +2599,7 @@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-indep $(SO
 	for iso in $(LANGPACKISOS); do \
 		if [ "$$iso" = "en-US" ]; then pkg=common; \
 		elif [ "$$iso" = "ca-valencia" ]; then pkg=l10n-ca; \
+		elif [ "$$iso" = "st-Latn" ]; then pkg=l10n-sr; \
 		elif [ "$$iso" = "kmr-Latn" ]; then pkg=l10n-kmr; \
 		else pkg=l10n-`echo $$iso | tr A-Z a-z`; \
 		fi; \
@@ -2602,6 +2615,7 @@ ifeq "$(DEB_VENDOR)" "Debian"
 	  [ "$$iso" = "en-US" ] && continue; \
 	  pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
 	  [ "$$pkgiso" = "ca-valencia" ] && pkgiso=ca; \
+	  [ "$$pkgiso" = "sr-latn" ] && pkgiso=sr; \
 	  [ "$$pkgiso" = "kmr-latn" ] && pkgiso=kmr; \
 	  mkdir -p $(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt; \
 	  for otp in $$otps; do \

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