[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 7727261896015bb818c35f8b87ce12681570f64d
Merge: cef7719 1fa845e
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 14 13:45:08 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
changelog | 5 ++++-
rules | 6 ++----
scripts/joinctrl.py | 14 +++++++-------
3 files changed, 13 insertions(+), 12 deletions(-)
diff --cc changelog
index 576aa66,5543ec8..431a6fa
--- a/changelog
+++ b/changelog
@@@ -1,20 -1,27 +1,23 @@@
-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)
-
- * debian/control.in:
- - move ttf-liberation-fonts recommends to -common (closes: #747132)
- - move libpaper-utils recommends to -core
+libreoffice (1:5.2.0~rc2-2) UNRELEASED; urgency=medium
* debian/rules:
- - use dh_* -a instead of deprecated -s
+ - use (more) dh_* -a instead of deprecated -s
- -- Rene Engelhard <rene@debian.org> Wed, 13 Jul 2016 14:40:59 +0200
+ * debian/rules, debian/scripts/joinctrl.py: use $(PYTHON) (so python3),
+ "python" isn't pulled in (implicitely) anymore; update build-deps
+
+ -- Rene Engelhard <rene@debian.org> Thu, 14 Jul 2016 13:18:38 +0200
-libreoffice (1:5.1.4~rc2-2) unstable; urgency=medium
+libreoffice (1:5.2.0~rc2-1) experimental; urgency=medium
- * rebuild with clean debian/.. (closes: #827513)
+ * new upstream release candidate
+
+ * debian/rules:
+ - use dh_listpackages -a instead of deprecated -s
- -- Rene Engelhard <rene@debian.org> Fri, 17 Jun 2016 11:50:22 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 07 Jul 2016 08:18:31 +0200
-libreoffice (1:5.1.4~rc2-1) unstable; urgency=medium
+libreoffice (1:5.2.0~rc1-1) experimental; urgency=medium
* new upstream release candidate
- scales gtk3 smooth scaling events... (closes: #826654)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: