[libreoffice] 03/03: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 93d8afeef7bdc90353668ad9979cfccfd0639bbf
Merge: 4472a3b f1296c4
Author: Rene Engelhard <rene@debian.org>
Date: Thu Oct 22 07:28:04 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
patches/series
changelog | 4 ++++
patches/fix-xmlparse-with-icu55.diff | 33 +++++++++++++++++++++++++++
patches/series | 1 +
rules | 44 ------------------------------------
4 files changed, 38 insertions(+), 44 deletions(-)
diff --cc changelog
index 16bb259,2a99bff..ea3dba1
--- a/changelog
+++ b/changelog
@@@ -1,46 -1,12 +1,50 @@@
-libreoffice (1:5.0.3~rc1-3) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~alpha1-2) UNRELEASED; urgency=medium
+ * debian/patches/fix-xmlparse-with-icu55.diff: backport fix from
+ master fixing l10ntools' XML parsing with ICU 55
+
* debian/rules:
+ - recommend -gtk3 again in gnome as (even in Alpha1)
+ Save As.. works (at least for me...)
+ - remove l10ntools build hack again, now obsolete
- -- Rene Engelhard <rene@debian.org> Thu, 22 Oct 2015 07:25:32 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 19 Oct 2015 22:57:36 +0200
+
+libreoffice (1:5.1.0~alpha1-1) experimental; urgency=medium
+
+ * New upstream alpha release
+ - uses HttpURLConnection etc. of the JDK instead of commons httpclient
+ in the Wiki Publisher (closes: #800992)
+
+ * debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
+ remove again, we need the functionality for liblibreofficekitgtk.so
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control.lokit.in:
+ - suggest libgtk-3-dev instead of libgtk2.0-dev
+ - suggest gir-1.2-lokdocview-0.1
+ * debian/control*in, debian/rules:
+ - remove upstream gone kdeab and gnome-vfs, gconf options
+ * debian/control*.in, debian/rules:
+ - package the LOKDocView introspection stuff into gir1.2-lokdocview-0.1
+ - move liblibreofficekitgtk.so into -gtk3 as it's for Gtk3 now
+ * debian/rules:
+ - gtk3 is on per default now (closes: #799399). Keep -gnome depending on
+ -gtk as gtk3 crashes e.g. on "Save as..."
+ - disable the tests for now
+ - also disable the wiki publisher on gcj builds; uses Java 6+ stuff; make
+ -wiki-publisher depend on >= Java 6
+ * debian/rules: prepare for .ddebs: disable manual -dbg build if building
+ ddebs; use dh_strip --ddeb-migration to create .ddebs
+ * debian/libreoffice-core.bug-script.in: dpkg -l -gtk -gtk3 and -kde to list
+ installed VCLplugs
+
+ * merge from Ubuntu:
+ - add am and gug locales
+
+ -- Rene Engelhard <rene@debian.org> Mon, 19 Oct 2015 22:57:36 +0200
libreoffice (1:5.0.3~rc1-2) unstable; urgency=medium
diff --cc patches/series
index 3ca3230,5d4c71b..dc8f6c4
--- a/patches/series
+++ b/patches/series
@@@ -27,3 -28,6 +27,4 @@@ 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
-disable-tiledrendering-test.diff
+ fix-xmlparse-with-icu55.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: