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 890e2106901d4d1038489f653c016d105ba694d9
Merge: d86807f 98fcafc
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Mon Aug 24 16:34:50 2015 +0200
Merge commit '98fcafc690f10d78d14c4d805027e4b2a373db2a' into ubuntu-wily-5.0
Conflicts:
changelog
control
patches/series
source.lintian-overrides
changelog | 44 ++++++++++++++++++++
control.in | 2 +-
patches/gtk3-rtl.diff | 104 +++++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
rules | 24 ++++++++---
source.lintian-overrides | 0
6 files changed, 168 insertions(+), 7 deletions(-)
diff --cc changelog
index d3ba2af,bd358e9..3f51efc
--- a/changelog
+++ b/changelog
@@@ -1,27 -1,44 +1,71 @@@
+libreoffice (1:5.0.1~rc2-0ubuntu1~wily1) wily; urgency=medium
+
+ * new upstream rc
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Mon, 24 Aug 2015
10:24:52 +0200
+
+libreoffice (1:5.0.0-0ubuntu1~wily1) wily; urgency=medium
+
+ * LibreOffice 5.0.0 final release (identical to rc5)
+ * merge from Debian:
+ - debian/patches/disable-tiledrendering-test.diff: temporarily disable
test
+ - rulees: 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)
+ - rules: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)
+ * reduce diff to Debian: use Enhances in styles consistently
+ * depend from leaf themes like -style-sifr on -style-galaxy for now
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 07 Aug 2015
13:36:02 +0200
+
+ libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
+
+ * debian/patches/gtk3-rtl.diff: backport GTk3 RTL fixes (arrows, checkboxes)
+ from libreoffice-5-0
+
+ * debian/rules:
+ - bump libmysqlcppconn-dev and libclucene-dev build-deps to their
+ gcc 5 versions
+ - add explicit dh-python build-dependency
+ - temporarily disable -kde (KDE uninstallable in sid right now
+ anyway) and coinmp
+
+ * merge from Ubuntu:
+ - autopkgtest updates/fixes
+
+ -- Rene Engelhard <r...@debian.org> Wed, 12 Aug 2015 15:23:58 +0200
+
+ libreoffice (1:5.0.1~rc1-2) unstable; urgency=medium
+
+ * debian/patches/series: (re-)enable disable-tiledrendering-test.diff;
+ still fails...
+
+ -- Rene Engelhard <r...@debian.org> Sun, 09 Aug 2015 16:40:13 +0200
+
+ libreoffice (1:5.0.1~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * upload to unstable
+
+ * 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
++ - rules: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)
+ * debian/control.in: suggest breeze-icon-theme in -style-breeze (like the
+ other ones do for oxygen/tango)
+
+ -- Rene Engelhard <r...@debian.org> Sat, 08 Aug 2015 16:06:34 +0200
+
libreoffice (1:5.0.0~rc5-1) experimental; urgency=medium
* New upstream release candidate
diff --cc patches/series
index e2ad9d1,d9dc9e4..d861443
--- a/patches/series
+++ b/patches/series
@@@ -26,7 -28,6 +26,8 @@@ 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
+ gtk3-rtl.diff
+#lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+#mailmerge-base.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
