[libreoffice] 01/01: 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 6770ac7e726f95352b94c7105a0ba49bfbd0df80
Merge: 9a0879b d2b801d
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 20 21:39:58 2016 +0100

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

 changelog                        | 23 +++++++++++++++++++++++
 control                          |  8 ++++----
 control.ogltrans.in              |  1 +
 patches/disable-flaky-tests.diff | 13 +++++++++++++
 rules                            | 18 ++++++++++++------
 source/include-binaries          |  1 +
 tests/control                    |  2 +-
 tests/junit-subsequentcheck      |  3 +++
 8 files changed, 58 insertions(+), 11 deletions(-)

diff --cc changelog
index 34f06e4,f350def..b59bee6
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,26 +1,32 @@@
 +libreoffice (1:5.4.0~alpha0~git20161215-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~rc1~git20161218-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
+ 
+   * debian/patches/change-from-glew-to-epoxy.diff: backport from master;
+     as name says
+   * debian/patches/gtk3-opengl-slideshow.diff: backport from master to fix
+     ogltrans generically with gtk3
+   * debian/patches/disable-flaky-tests.diff: also disable svx.AccessibleShape
+ 
+   * debian/control.ogltrans.in:
+     - add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
+   * debian/tests/junit-subsequentcheck:
+     - apply disable-flaky-tests.diff
+ 
+   * debian/rules:
+     - change glew conditionals/build-deps to epoxy
+     - temporarily use internal libgltf until libgltf 0.1.0 (using epoxy)
+       is out of NEW...
+     - ENABLE_GDRIVE=y again on armhf and arm64
+ 
+  -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:35:52 +0100
+ 
  libreoffice (1:5.3.0~beta2-1) experimental; urgency=medium
  
    * New upstream beta release
diff --cc control
index 5982cc9,1bae67c..0a4f193
--- a/control
+++ b/control
@@@ -182,7 -181,7 +181,7 @@@ Build-Conflicts: amd-libopencl1
  Standards-Version: 3.9.4
  Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.3
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
--Bugs: 
++Bugs: mailto:debian-openoffice at lists.debian.org
  Homepage: http://www.libreoffice.org
  
  Package: libreoffice

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