[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.3-3-8-g28e2b7b
The following commit has been merged in the debian-experimental-4.0 branch:
commit 28e2b7bf5d8fcb69d49509e21d5456e0456be5bd
Merge: 7af15bb1bb300d7308ae2ef1d4c23b6d49fa4f71 20824c9fcf1aa2d06de53556803930ebf5613cde
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Sun Jun 2 16:13:59 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.0
diff --combined changelog
index e2a6c0b,fbdd899..85f12e3
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,9 +1,18 @@@
+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-4) UNRELEASED; urgency=low
* debian/control:
- regenerate; uses libservlet3.0-java instead of libservlet3.0-java now
+ * debian/rules:
+ - enable graphite2 on all archs now that it's fixed on armel/sparc
-- Rene Engelhard <rene@debian.org> Tue, 28 May 2013 20:43:19 +0200
diff --combined control
index 161aee4,84c06fb..dd6170c
--- a/control
+++ b/control
@@@ -46,7 -46,7 +46,7 @@@ Build-Depends: ant (>= 1.7.0)
libgl1-mesa-dev [!armel !mips !mipsel],
libglib2.0-dev (>= 2.15.0),
libglu1-mesa-dev [!armel !mips !mipsel],
- libgraphite2-dev (>= 0.9.3) [!armel !sparc],
+ libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
@@@ -164,7 -164,7 +164,7 @@@ XS-Python3-Version: 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,37 -2017,6 +2017,37 @@@ Description: office productivity suite
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 --combined rules
index 971ca8b,d9dea0b..b96a1a5
--- a/rules
+++ b/rules
@@@ -69,11 -69,11 +69,11 @@@ USE_SOURCE_TARBALLS=
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)
@@@ -591,19 -591,9 +591,9 @@@ ifneq "$(ENABLE_MINIMIZER)" "y
endif
BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev
- # fails their tests
- ifeq "$(DEB_HOST_ARCH)" "armel"
- ENABLE_GRAPHITE=n
- SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
- endif
- ifeq "$(DEB_HOST_ARCH)" "sparc"
- ENABLE_GRAPHITE=n
- SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
- endif
-
ifeq "$(ENABLE_GRAPHITE)" "y"
ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) [!armel !sparc]
+ BUILD_DEPS += , libgraphite2-dev (>= 0.9.3)
endif
else
CONFIGURE_FLAGS += --disable-graphite
@@@ -762,7 -752,7 +752,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 -765,7 +765,7 @@@
#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: