[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 22fbdf409afc6e36c4f562f0890841bf236b08c9
Merge: f6fc5a5 9421ca3
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 25 15:34:16 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
patches/series
changelog | 7 +++++++
patches/jre-update-gt-99.diff | 31 +++++++++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 39 insertions(+)
diff --cc changelog
index efeeb17,93b4b8a..86100c1
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,21 +1,16 @@@
-libreoffice (1:5.1.5~rc1-2) UNRELEASED; urgency=medium
++libreoffice (1:5.2.0~rc3-2) UNRELEASED; urgency=medium
+
+ * debian/patches/jre-update-gt-99.diff: backport from libreoffice-5-2;
+ allow java update version number > 99
+
+ -- Rene Engelhard <rene@debian.org> Mon, 25 Jul 2016 15:30:45 +0200
+
-libreoffice (1:5.1.5~rc1-1) unstable; urgency=medium
+libreoffice (1:5.2.0~rc3-1) experimental; urgency=medium
- * New upstream release candidate
- - only initializes the OpenGL context if we need it (closes: #819153)
-
- * 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
diff --cc patches/series
index 8d6d406,4b00694..5d00382
--- a/patches/series
+++ b/patches/series
@@@ -28,5 -29,12 +28,6 @@@ hppa-is-32bit.dif
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
-disable-npapi-plugin-support.diff
-gcc-6.diff
-bash-completion-dir.diff
-OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
-liborcus-0.11.diff
-kde4-cflags-no-usr-include.diff
-mdds-1.2.0.diff
+sparc64.diff
+ jre-update-gt-99.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: