[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.6.1_rc2-1-68-g43ed799
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 43ed79971c2cc49865372eaea47f508b36e7403b
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat Sep 1 02:39:15 2012 +0200
test for ca-XV files before trying to use them
diff --git a/changelog b/changelog
index 07b3b33..c2910fa 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,19 @@
+libreoffice (1:3.6.1~rc2-1ubuntu2) quantal-proposed; urgency=low
+
+ * test for ca-XV files before trying to use them
+ - ca-XV l10n files are special-cased in that they are merged in the ca l10n
+ packaged
+ - the libreoffice-l10n-* files are generated by gid2pkgdirs.sh
+ - for an binary-only, arch dep-only build ca-XV might be set in
+ LANGPACKISOS and HELPISOS, even though we do not pass such parameters to
+ ./autogen.sh and thus neither scp2 nor gid2pkgdirs.sh generate any l10n
+ package files
+ - this wasnt discovered on the ppa builds because of ppa filesystem
+ limitations, we can only building with a subset of l10n (not ca-XV) there,
+ thus shadowing the issue, even though we do binary-only, arch dep-only builds.
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 01 Sep 2012 02:19:11 +0200
+
libreoffice (1:3.6.1~rc2-1ubuntu1) quantal-proposed; urgency=low
* version bump for quantal main including upstream, debian and unitymenu
diff --git a/rules b/rules
index f9e0e22..9b15020 100755
--- a/rules
+++ b/rules
@@ -1740,13 +1740,13 @@ $(STAMP_DIR)/install-common:
# 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
+ test -f debian/libreoffice-l10n-ca-VX.dirs && cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs || true
+ test -f debian/libreoffice-l10n-ca-VX.install && cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install || true
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
+ test -f debian/libreoffice-help-ca-VX.dirs && cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs || true
+ test -f debian/libreoffice-help-ca-VX.install && debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install || true
rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install
endif
--
LibreOffice packaging repository
Reply to: