[libreoffice] 16/16: Merge unrevisioned changes from '1:5.0.1-0ubuntu2' into ubuntu-wily-5.0
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to tag libreoffice_5.0.2-0ubuntu1
in repository libreoffice.
commit 710489973238460f2aa408082828b3b131311956
Merge: 2e90c72 cbaa571
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Oct 1 15:25:13 2015 +0200
Merge unrevisioned changes from '1:5.0.1-0ubuntu2' into ubuntu-wily-5.0
Conflicts:
changelog
rules
changelog | 11 +++++++++--
patches/series | 2 +-
rules | 5 +++--
3 files changed, 13 insertions(+), 5 deletions(-)
diff --cc changelog
index 636a351,070d032..dbdb4bf
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,12 +1,23 @@@
+libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+ * removed upstreamed patches
- * use system libwps, libcmis, cppunit
- * use system libetonyek, which is in main now (lp: #1410883)
+ * cherry-picks from Debian:
+ - update shlibs.override
+ - bump gtk+ requirements
+ - move liblibreofficekitgtk.so to -gtk
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 01 Oct 2015 00:49:31 +0200
+
+ libreoffice (1:5.0.1-0ubuntu2) wily; urgency=medium
+
+ * Build for arm64 and ppc64el.
+ * Build using system libraries for libcppunit, libetonyek, liborcus,
+ libpagemaker, libwps and libcmis. The internal copies are not updated
+ for at least ppc64el.
+
+ -- Matthias Klose <doko@ubuntu.com> Fri, 11 Sep 2015 17:22:56 +0200
+
libreoffice (1:5.0.1-0ubuntu1) wily; urgency=medium
* new final upstream release
diff --cc patches/series
index e2ad9d1,0cdfdfa..6a889d5
--- a/patches/series
+++ b/patches/series
@@@ -26,7 -26,8 +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
-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
Reply to: