[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.3-3-3-g07c19e4
The following commit has been merged in the debian-experimental-4.0 branch:
commit 07c19e412a2ed4a2dc5a8e1cce20843ffdf36233
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 28 18:34:05 2013 +0200
4.0.4 rc1; enable kk l10n
diff --git a/changelog b/changelog
index 1cce386..ed5454a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:4.0.4~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - enable kk (kazakh) l10n (closes: #700835)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 May 2013 19:45:10 +0200
+
libreoffice (1:4.0.3-3) unstable; urgency=low
* debian/patches/uno-executables-link-to-xmlreader.diff: fix
diff --git a/control b/control
index 336ac31..161aee4 100644
--- a/control
+++ b/control
@@ -164,7 +164,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -2017,6 +2017,37 @@ Description: office productivity suite -- Georgian language package
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
+Package: libreoffice-l10n-kk
+Section: localization
+Architecture: all
+Depends: libreoffice-common,
+ locales | belocs-locales-data | locales-all,
+ ${misc:Depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-kk
+Provides: libreoffice-l10n-${help-l10n-virtual-version}
+Suggests: hunspell-dictionary-kk | myspell-dictionary-kk,
+ hyphen-kk,
+ libreoffice-grammarcheck-kk,
+ libreoffice-help-kk,
+ mythes-kk
+Description: office productivity suite -- Kazakh language package
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of LibreOffice in
+ Kazakh.
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages).
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+
Package: libreoffice-l10n-km
Section: localization
Architecture: all
diff --git a/patches/boost-1.53.diff b/patches/boost-1.53.diff
index 9aca5ee..c315b24 100644
--- a/patches/boost-1.53.diff
+++ b/patches/boost-1.53.diff
@@ -197,59 +197,3 @@ index 01707e6..e64646f 100644
maRange(),
--
cgit v0.9.0.2-2-gbebe
-From faf72664d11deaa570a0f8c7e702ff07bf5914c8 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Sun, 17 Feb 2013 10:49:34 +0000
-Subject: Missing include in liborcus when building against Boost 1.53.0
-
-Change-Id: Ie6c944d53d6e2fcdd161f674e32c9fbfd761d844
----
-diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
-index ca5232d..de0788a 100644
---- a/liborcus/UnpackedTarball_orcus.mk
-+++ b/liborcus/UnpackedTarball_orcus.mk
-@@ -18,6 +18,10 @@ orcus_patches :=
- orcus_patches += liborcus_0.1.0-configure.patch
- # disable boost "auto lib" in MSVC build
- orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
-+# <https://gitorious.org/orcus/orcus/merge_requests/2#
-+# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
-+# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
-+orcus_patches += liborcus_0.1.0-boost-include.patch.1
-
- $(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
- vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
-diff --git a/liborcus/liborcus_0.1.0-boost-include.patch.1 b/liborcus/liborcus_0.1.0-boost-include.patch.1
-new file mode 100644
-index 0000000..07558b0
---- /dev/null
-+++ b/liborcus/liborcus_0.1.0-boost-include.patch.1
-@@ -0,0 +1,26 @@
-+From f60d6eecee72349993a392a9a63ddf3383d3b8c8 Mon Sep 17 00:00:00 2001
-+From: Stephan Bergmann <sbergman@redhat.com>
-+Date: Sat, 16 Feb 2013 13:25:44 +0100
-+Subject: [PATCH] Missing include <boost/noncopyable.hpp>
-+
-+(at least when compiling against Boost 1.53.0)
-+---
-+ src/liborcus/dom_tree.cpp | 2 ++
-+ 1 file changed, 2 insertions(+)
-+
-+diff --git a/src/liborcus/dom_tree.cpp b/src/liborcus/dom_tree.cpp
-+index ecf7beb..14725ad 100644
-+--- a/src/liborcus/dom_tree.cpp
-++++ b/src/liborcus/dom_tree.cpp
-+@@ -34,6 +34,8 @@
-+ #include <iostream>
-+ #include <sstream>
-+
-++#include <boost/noncopyable.hpp>
-++
-+ using namespace std;
-+
-+ namespace orcus {
-+--
-+1.8.1.2
-+
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/lo-xlate-lang-updates.diff b/patches/lo-xlate-lang-updates.diff
new file mode 100644
index 0000000..8aedc46
--- /dev/null
+++ b/patches/lo-xlate-lang-updates.diff
@@ -0,0 +1,12 @@
+diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang
+index 7549f85..7e16a6c 100755
+--- a/bin/lo-xlate-lang
++++ b/bin/lo-xlate-lang
+@@ -165,6 +165,7 @@ __DATA__
+ :oc:occitan
+ :ro:romanian
+ :eu:basque
++:kk:kazakh
+ :mn:mongolian
+ :om:oromo
+ :bo:tibetan
diff --git a/patches/series b/patches/series
index 67ed5dc..70db8fb 100644
--- a/patches/series
+++ b/patches/series
@@ -29,5 +29,5 @@ dont-touch-urd.diff
system-psql-no-krb5-gssapi-check.diff
wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
-boost-1.53.diff
uno-executables-link-to-xmlreader.diff
+lo-xlate-lang-updates.diff
diff --git a/rules b/rules
index b359487..5948f96 100755
--- a/rules
+++ b/rules
@@ -69,11 +69,11 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=4.0.3.3
+lo_sources_ver=4.0.4.1
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-4-0-3
+GIT_BRANCH=libreoffice-4-0-4
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -762,7 +762,7 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
#ISOS=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
ISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
- ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
+ ka kk km ko ku 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 \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
ifeq "$(ENABLE_HELP)" "n"
@@ -775,7 +775,7 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
#LANGPACKISOS:=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
LANGPACKISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
- ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
+ ka kk km ko ku 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 \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
endif
--
LibreOffice packaging repository
Reply to: