[libreoffice] 02/02: Merge remote-tracking branch 'origin/debian-experimental-5.3' into debian-experimental-5.4

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit b807a0e754fe9aeeb997cc1791d6ef580671379d
Merge: da8afc3 c245216
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 30 15:25:37 2016 +0100

    Merge remote-tracking branch 'origin/debian-experimental-5.3' into debian-experimental-5.4

 changelog     | 15 +++++++++++++++
 control       |  1 +
 rules         |  6 +++++-
 tests/control |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --cc changelog
index 9c75e08,ec337ab..7711d70
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,18 +1,24 @@@
 +libreoffice (1:5.4.0~alpha0~git20161229-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 +
+ libreoffice (1:5.3.0~rc2~git20161229-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
+ 
+   * debian/patches/change-from-glew-to-epoxy.diff: update
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 29 Dec 2016 15:21:41 +0100
+ 
+ libreoffice (1:5.3.0~rc1-2) experimental; urgency=medium
+ 
+   * debian/rules:
+     - readd somehow lost libgl1-mesa-dev build-dependency...
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 24 Dec 2016 01:01:40 +0100
+ 
  libreoffice (1:5.3.0~rc1-1) experimental; urgency=medium
  
    * New upstream release candidate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git