[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 5ac39c25b382821c10c42fc9b3be6048fb28358c
Merge: 1b8dbab b00c1be
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 30 15:24:19 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.3
Conflicts:
changelog
changelog | 28 +++++++++++++++++++++++++---
libreoffice-core.bug-script.in | 2 +-
patches/curl-7.50.0.diff | 23 +++++++++++++++++++++++
patches/jre-update-gt-99.diff | 31 +++++++++++++++++++++++++++++++
patches/series | 2 ++
ure.bug-script.in | 2 +-
6 files changed, 83 insertions(+), 5 deletions(-)
diff --cc changelog
index 9bc905d,d57c1b7..8c575d6
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,26 +1,35 @@@
- libreoffice (1:5.3.0~alpha0~git20160714-1) UNRELEASED; urgency=medium
++libreoffice (1:5.3.0~alpha0~git20160730-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
+ versioned Provides
+
+ -- Rene Engelhard <rene@debian.org> Thu, 26 May 2016 20:00:57 +0200
+
- libreoffice (1:5.2.0~rc2-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.2.0-1) unstable; urgency=medium
+
+ * LibreOffice 5.2.0 final (identical to rc4)
+
+ * debian/patches/curl-7.50.0.diff: add from master; fix build with
+ curl 7.50.0
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Sat, 30 Jul 2016 07:32:37 +0200
+
+ 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> Fri, 29 Jul 2016 07:31:55 +0200
+
+ libreoffice (1:5.2.0~rc3-1) experimental; urgency=medium
+
+ * new upstream release candidate
* debian/rules:
- use (more) dh_* -a instead of deprecated -s
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: