The following commit has been merged in the debian-experimental-4.0 branch:
commit ba9207ceefcb72d6e78e7da700d832ee04da028b
Merge: d3a34b280c5ac18a41d93b98ed609ccd0d6d50bf
1f046fcd2ee7913733aa748a249bc895f66c7cd8
Author: Rene Engelhard <r...@rene-engelhard.de>
Date: Sat Jun 15 13:22:32 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.0
Conflicts:
changelog
diff --combined changelog
index 7c2e304,7034380..c3d7dc8
--- a/changelog
+++ b/changelog
@@@ -1,15 -1,17 +1,20 @@@
-libreoffice (1:4.0.3-4) UNRELEASED; urgency=low
+libreoffice (1:4.0.4~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
- * debian/control:
- - regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
* debian/rules:
+ - enable kk (kazakh) l10n (closes: #700835)
- enable graphite2 on all archs now that it's fixed on armel/sparc
+ * debian/control:
+ - regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
- fix -dbg suggests: s/python/$(PYTHON)/. to suggest python3.3-dbg
+ - temporarily force gcc-4.6(!) (instead of build-conflicting
+ against gcc (>< 4:4.7~) on all archs except *i386/*amd64 until
+ all bridges are ported to the new gcc 4.7+ behaviour
+ - remove last buildd special-caing: build --enable-verbose everyhwere,
+ also on the buildds
- -- Rene Engelhard <r...@debian.org> Tue, 11 Jun 2013 18:35:56 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 13 Jun 2013 21:19:31 +0200
libreoffice (1:4.0.3-3) unstable; urgency=low
diff --combined control
index dd6170c,3d6d8b4..445d2d2
--- a/control
+++ b/control
@@@ -16,7 -16,9 +16,9 @@@ Build-Depends: ant (>= 1.7.0)
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
+ g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
+ gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
@@@ -145,7 -147,6 +147,6 @@@ Build-Conflicts: ant (= 1.8.0-1) [hppa
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
- gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64],
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
graphicsmagick-imagemagick-compat (<< 1.3.9~),
@@@ -2017,37 -2018,6 +2018,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
@@@ -4459,7 -4429,9 +4460,9 @@@ Depends: ant (>= 1.7.0)
fastjar,
flex | flex-old,
fontforge,
+ g++-4.6,
g++-mingw-w64-i686,
+ gcc-4.6,
gcj-jdk,
gcj-native-helper,
gdb,
diff --combined rules
index 65dc9b8,e275ec1..b6dbc99
--- a/rules
+++ b/rules
@@@ -37,9 -37,6 +37,6 @@@ export gb_SHELL:=$(SHELL
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n
'/^gcc/s/.*\(.\..\)\..$$/\1/p')
- # Debian buildds run as user `buildd', other are using /CurrentlyBuilding
- ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] ||
echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
-
PKGDIR:=debian/libreoffice
OODIRNAME=libreoffice
OODIR:=usr/lib/$(OODIRNAME)
@@@ -69,11 -66,11 +66,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.2
# 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)
@@@ -173,7 -170,7 +170,7 @@@ els
BOOST_VERSION=1.53
endif
ifeq "$(BOOST_VERSION)" "default"
- ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.8 && echo
true)" "true"
BOOST_MINVER= (>= 1.53)
else
BOOST_MINVER= (>= 1.38)
@@@ -201,7 -198,7 +198,7 @@@ CAIRO_FONTS_PATCH=
BUILD_KDE=y
# not ported to KDE 4
ENABLE_KDEAB=n
- ifeq "$(SYSTEM_GCC_VERSION)" "4.7"
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.7 && echo
true)" "true"
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
else
@@@ -393,9 -390,7 +390,7 @@@ ifeq "$(shell echo $(DEB_VERSION_UPSTRE
CONFIGURE_FLAGS += --enable-release-build
endif
- ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
- endif
CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
@@@ -555,6 -550,14 +550,14 @@@ CONFIGURE_FLAGS += $(foreach i, $(SYSTE
CC_PREFIX:=$(shell gcc -dumpmachine)-
+ BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64]
,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+ ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
+ ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+ ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
+ GCC_VERSION := 4.6
+ endif
+ endif
+ endif
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
@@@ -754,7 -757,7 +757,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"
@@@ -767,7 -770,7 +770,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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1unozo-0002w4...@vasks.debian.org
