[libreoffice] 07/19: Merge remote-tracking branch 'origin/debian-experimental-5.0' into ubuntu-wily-5.0
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit 83236466be92181150660f1274a0a765db4280bd
Merge: 66bda51 fd7078c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Aug 7 12:44:02 2015 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.0' into ubuntu-wily-5.0
Conflicts:
changelog
control
control.in
patches/series
rules
changelog | 41 +++++++++++++++++
control.in | 4 +-
patches/disable-tiledrendering-test.diff | 17 ++++++++
patches/series | 1 +
rules | 75 ++++++++++++++++++++++++--------
5 files changed, 118 insertions(+), 20 deletions(-)
diff --cc changelog
index cb0fb4a,955a50e..42a2530
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,44 +1,62 @@@
+ libreoffice (1:5.0.0-1) UNRELEASED; urgency=medium
+
+ * LibreOffice 5.0.0 final release (identical to rc5)
+
+ * debian/patches/disable-tiledrendering-test.diff: temporarily disable test
+ * debian/rules:
+ - bump build-depends on libgltf, *collada*, cppunit, liborcus, libcmis to
+ build-depend on their gcc 5 rebuilds. Bump boost build-dep to >= 1.58
+ (closes: #794717)
+ - fix SYSTEM_GCC_CHECK for gcc 5; remove obsolete >= 4.7 check for Qt to get
+ correct build-dep
+ - temporarily disable -evolution until libebook1.2-dev is installable again
+ * debian/control.in: suggest breeze-icon-theme in -style-breeze (like the
+ other ones do for oxygen/tango)
+
+ -- Rene Engelhard <rene@debian.org> Tue, 04 Aug 2015 09:35:18 +0000
+
+ libreoffice (1:5.0.0~rc5-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - ENABLE_MERGELIBS=n on kfreebsd-* for now ("Argument list too long")
+ - ENABLE_COLLADA=y (for i386/amd64) now that the libs finally are in
+ Debian
+ - KDE_ICONSET_DEP=libreoffice-style-breeze (closes: #794318)
+ * debian/control.in:
+ - update -l10n conflicts in -common, remove 3.5/3.6, add 4.3/4.4
+ (closes: #794024)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 01 Aug 2015 14:00:45 +0200
+
+libreoffice (1:5.0.0~rc5-0ubuntu1~wily1) wily; urgency=medium
+
+ * new upstream rc
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 01 Aug 2015 18:31:31 +0200
+
+libreoffice (1:5.0.0~rc4-1ubuntu1~wily1) wily; urgency=medium
+
+ * New upstream rc
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 29 Jul 2015 11:57:52 +0200
+
+ libreoffice (1:5.0.0~rc4-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - ENABLE_MERGELIBS=y as it's now upstream default
+
+ -- Rene Engelhard <rene@debian.org> Sat, 25 Jul 2015 11:59:25 +0200
+
+libreoffice (1:5.0.0~rc3.1-1ubuntu1~wily1) wily; urgency=medium
+
+ * merge from Debian
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 10 Jul 2015 19:18:44 +0200
+
libreoffice (1:5.0.0~rc3-1) experimental; urgency=medium
* New upstream release candidate
diff --cc patches/series
index 562bc82,8d6e17e..e2ad9d1
--- a/patches/series
+++ b/patches/series
@@@ -26,6 -28,5 +26,7 @@@ odk-no-dot.dif
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
-liborcus-0.9.1.diff
+#liborcus-0.9.1.diff
+ disable-tiledrendering-test.diff
+#lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+#mailmerge-base.diff
diff --cc rules
index 5c7d621,a69e65e..cb3ddb6
--- a/rules
+++ b/rules
@@@ -373,7 -389,13 +390,12 @@@ SYSTEM_STUFF += harfbuz
ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
+ CPPUNIT_MINVER=1.13.2-2.1
+ else
+ CPPUNIT_MINVER=0.12
+ endif
-DEFAULT_IMAGE=galaxy
-IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
+IMAGES:=galaxy hicontrast oxygen tango sifr breeze
ENABLE_MYSQLNATIVE=y
USE_MARIADB=n
# set this also to y for system-mysql..
@@@ -415,8 -447,9 +447,11 @@@ USE_UCPP=
ifeq "$(USE_UCPP)" "y"
SYSTEM_STUFF += ucpp
endif
+ENABLE_MERGELIBS=n
+ENABLE_LTO=n
+ ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
+ ENABLE_MERGELIBS=y
+ endif
USE_OPENCL=y
#10:15 <@_rene_> ahunt: I remember you wanted to do some endian things? did it
# ever get done?
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: