[libreoffice] 01/06: Merge branch 'debian-experimental-5.2'
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 650349a166b0594d8b64bc3df32899976d95af19
Merge: d5af988 63f62d2
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 30 07:32:30 2016 +0200
Merge branch 'debian-experimental-5.2'
Conflicts:
changelog
patches/OPENCL_DLL_NAME.diff
patches/series
changelog | 83 +-
control | 160 +-
control.gtk3.in | 31 +-
control.in | 11 +-
control.lokit.in | 2 +-
control.nlpsolver.in | 13 +
control.sdk.in | 21 +-
...office-gtk3.links => liblibreofficekitgtk.links | 0
libreoffice-core.bug-script.in | 2 +-
libreoffice-gtk.maintscript | 1 -
libreoffice-gtk2.lintian-overrides | 1 +
patches/OPENCL_DLL_NAME.diff | 30 -
patches/bash-completion-dir.diff | 22 -
patches/debian-hardened-buildflags-CPPFLAGS.diff | 8 +-
patches/disable-flaky-tests.diff | 4 +-
patches/disable-npapi-plugin-support.diff | 28 -
...-t-install-qstart.desktop-if-it-s-disabled.diff | 40 -
patches/gcc-6.diff | 49 -
patches/javadoc-optional.diff | 6 +-
patches/kde4-cflags-no-usr-include.diff | 26 -
patches/kfreebsd-openjdk8-JAVAINC.diff | 28 -
patches/liborcus-0.11.diff | 1026 ---------
patches/make-package-modules-not-suck.diff | 27 +-
patches/mdds-1.2.0.diff | 362 ----
patches/no-packagekit-per-default.diff | 161 ++
patches/series | 10 +-
patches/sparc64.diff | 2180 ++++++++++++++++++++
patches/split-evoab.diff | 4 +-
rules | 240 ++-
scripts/gid2pkgdirs.sh | 2 +
source/include-binaries | 3 +-
tests/control | 4 +-
tests/control.in | 2 +-
tests/sdk-examples | 9 +-
uno-libs3.symbols | 1 +
vars.sparc64 | 1 +
36 files changed, 2738 insertions(+), 1860 deletions(-)
diff --cc changelog
index 5d49295,10e6f86..f7dac28
--- a/changelog
+++ b/changelog
@@@ -5,19 -5,14 +5,14 @@@ libreoffice (1:5.2.0~rc4-1) experimenta
* debian/patches/jre-update-gt-99.diff: backport from libreoffice-5-2;
allow java update version number > 99
- -- Rene Engelhard <rene@debian.org> Fri, 29 Jul 2016 07:31:55 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 26 Jul 2016 11:47:21 +0200
- libreoffice (1:5.1.5~rc1-1) unstable; urgency=medium
-
- * New upstream release candidate
- - only initializes the OpenGL context if we need it (closes: #819153)
+ libreoffice (1:5.2.0~rc3-1) experimental; urgency=medium
- * debian/control.in:
- - move ttf-liberation-fonts recommends to -common (closes: #747132)
- - move libpaper-utils recommends to -core
+ * new upstream release candidate
* debian/rules:
- - use dh_* -a instead of deprecated -s
+ - use (more) dh_* -a instead of deprecated -s
* debian/rules, debian/scripts/joinctrl.py: use $(PYTHON) (so python3),
"python" isn't pulled in (implicitely) anymore; update build-deps
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: