[libreoffice] 06/152: handle integral translations

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit df5e89f38e9cb386ead170653d2bc29bc549850d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Oct 23 00:28:28 2015 +0200

    handle integral translations
    
    - these translations have to be done from libreoffice source package as they
      are not separatable
    - sadly this adds even more dependencies on the translations tarball from the
      non-l10n libreoffice source package
---
 changelog                  |  3 ++-
 patches/integraltrans.diff | 23 +++++++++++++++++++++++
 patches/series             |  1 +
 rules                      |  2 ++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index d5eeb51..203269c 100644
--- a/changelog
+++ b/changelog
@@ -9,8 +9,9 @@ libreoffice (1:5.0.2-0ubuntu2) wily; urgency=medium
   * add build version for "About LibreOffice"
   * create profile defaulting to human style on unity (lp: #1508177)
   * reenable Ubuntu palette
+  * handle integral translations
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 21 Oct 2015 16:45:24 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Fri, 23 Oct 2015 00:23:47 +0200
 
 libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium
 
diff --git a/patches/integraltrans.diff b/patches/integraltrans.diff
new file mode 100644
index 0000000..dc5e5a9
--- /dev/null
+++ b/patches/integraltrans.diff
@@ -0,0 +1,23 @@
+From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
+Date: Fri, 23 Oct 2015 00:01:16 +0200
+Subject: [PATCH] use different var for inseparatable translations
+
+---
+ sysui/CustomTarget_share.mk               | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
+--- a/sysui/CustomTarget_share.mk
++++ b/sysui/CustomTarget_share.mk
+@@ -227,7 +227,7 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \
+ $(eval $(call gb_CustomTarget_ulfex_rule,\
+ 	$(share_WORKDIR)/%.ulf,\
+ 	$(share_SRCDIR)/share/%.ulf,\
+-	$(foreach lang,$(gb_TRANS_LANGS),\
++	$(foreach lang,$(gb_TRANS_LANGS_INTEGRAL),\
+ 		$(gb_POLOCATION)/$(lang)/sysui/desktop/share.po)))
+ 
+ # vim: set noet sw=4 ts=4:
+-- 
+2.1.4
+
diff --git a/patches/series b/patches/series
index 1aafef2..05aacb1 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ disable-tiledrendering-test.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 #mailmerge-base.diff
 unity-default-human.diff
+integraltrans.diff
diff --git a/rules b/rules
index 6dce68e..e822f34 100755
--- a/rules
+++ b/rules
@@ -1832,6 +1832,7 @@ endif
 config_host.mk:
 	rm -f config.status autogen.lastrun
 	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) PYTHON=/usr/bin/python3 ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
+	echo "export gb_TRANS_LANGS_INTEGRAL=$(filter-out en-US,$(BUILD_ISOS))" >> config_host.mk
 
 build:
 	$(CURDIR)/debian/rules build-arch
@@ -1856,6 +1857,7 @@ $(STAMP_DIR)/build-arch:
 		--disable-report-builder --disable-scripting-javascript \
 		--disable-scripting-beanshell \
 		--with-galleries=no
+	echo "export gb_TRANS_LANGS_INTEGRAL=$(filter-out en-US,$(BUILD_ISOS))" >> config_host.mk
 
 	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-non-l10n-only
 

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