[libreoffice] 04/05: 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 71894dd9a02694ca7aecd677fe33581fcf55bb9f
Merge: 487fead cdf3e44
Author: Rene Engelhard <rene@debian.org>
Date: Sun Nov 8 12:22:19 2015 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
patches/series
changelog | 16 ++++++++++++++++
patches/debian-branding.diff | 13 +++++++++++++
patches/series | 1 +
3 files changed, 30 insertions(+)
diff --cc changelog
index 849b3d1,325cfca..11a128e
--- a/changelog
+++ b/changelog
@@@ -35,47 -12,18 +35,56 @@@ libreoffice (1:5.1.0~alpha1-2) experime
charmaps; backported from master
* debian/rules:
+ - recommend -gtk3 again in gnome as (even in Alpha1)
+ Save As.. works (at least for me...) - closes: #681180
- remove l10ntools build hack again, now obsolete
+ * debian/control{.sdk}.in, debian/rules, debian/libreoffice-dev-doc.links:
+ - stop moving the SDK docs into libreoffice-devs /usr/share/doc (and move
+ the stuff installed into /usr/share/doc/libreoffice/sdk in libreoffice-dev
+ to /usr/share/doc/libreoffice-dev, too) and conflict against
+ libreoffice-dev / libreoffice-dev-doc (<= 1:5.0.3~rc1-2) where needed
+ (closes: #803272, #803306)
+ * debian/control.ure.in:
+ - also break libreoffice-common in ure in addition to Replaces:
+ (closes: #801552, #803565) and make it << 1:4.5.0 which was meant...
- -- Rene Engelhard <rene@debian.org> Sat, 31 Oct 2015 14:15:25 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 24 Oct 2015 18:52:43 +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,2815a9b..504f0e1
--- a/patches/series
+++ b/patches/series
@@@ -27,3 -28,7 +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
+ debian-branding.diff
-icu-56.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: