[libreoffice] 05/06: Merge branch 'master' of ssh://git.debian.org/git/pkg-openoffice/libreoffice
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit ce45ae1e1eb4f60836f1e35fe6927fd8e44ada22
Merge: 034d497 0b0c664
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 30 13:41:12 2016 +0200
Merge branch 'master' of ssh://git.debian.org/git/pkg-openoffice/libreoffice
Conflicts:
changelog
changelog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc changelog
index fb152ed,eee9bcd..50bb62c
--- a/changelog
+++ b/changelog
@@@ -1,29 -1,20 +1,29 @@@
-libreoffice (1:5.1.5~rc2-1) unstable; urgency=medium
+libreoffice (1:5.2.0-1) unstable; urgency=medium
- * new upstream release candidate
+ * LibreOffice 5.2.0 final (identical to rc4)
- -- Rene Engelhard <rene@debian.org> Wed, 27 Jul 2016 06:32:56 +0200
+ * debian/patches/curl-7.50.0.diff: add from master; fix build with
+ curl 7.50.0
-libreoffice (1:5.1.5~rc1-1) unstable; urgency=medium
+ * upload to unstable
- * New upstream release candidate
- - only initializes the OpenGL context if we need it (closes: #819153)
+ -- Rene Engelhard <rene@debian.org> Sat, 30 Jul 2016 07:32:37 +0200
- * debian/control.in:
- - move ttf-liberation-fonts recommends to -common (closes: #747132)
- - move libpaper-utils recommends to -core
+libreoffice (1:5.2.0~rc4-1) experimental; urgency=medium
+
+ * new upstream release candidate
+
+ * debian/patches/jre-update-gt-99.diff: backport from libreoffice-5-2;
+ allow java update version number > 99
+
- -- Rene Engelhard <rene@debian.org> Tue, 26 Jul 2016 11:47:21 +0200
++ -- Rene Engelhard <rene@debian.org> Wed, 27 Jul 2016 06:32:56 +0200
+
+libreoffice (1:5.2.0~rc3-1) experimental; urgency=medium
+
+ * 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: