[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.2' 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 eaa4a6287f6933ff499b09e0434ee0bd706e088c
Merge: 5ac39c2 6076763
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 30 15:36:21 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
Conflicts:
changelog
rules
changelog | 6 ++++++
patches/curl-7.50.0.diff | 23 -----------------------
patches/jre-update-gt-99.diff | 31 -------------------------------
patches/series | 2 --
4 files changed, 6 insertions(+), 56 deletions(-)
diff --cc changelog
index 8c575d6,5abef53..24f2d23
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,9 +1,18 @@@
+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.1~rc1~git20160730-1) UNRELEASED; urgency=medium
+
+ * new upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Sat, 30 Jul 2016 15:31:55 +0200
+
libreoffice (1:5.2.0-1) unstable; urgency=medium
* LibreOffice 5.2.0 final (identical to rc4)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: