[libreoffice] 06/06: Merge branch 'master' into debian-experimental-5.3

[Rene Engelhard]

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 9ee3641ce2b171304c393031dfa9a57b242c28db
Merge: a1cad87 88cd499
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Dec 19 18:04:04 2016 +0100

    Merge branch 'master' into debian-experimental-5.3
    
    Conflicts:
    	patches/disable-flaky-tests.diff

 changelog                        |  3 +++
 patches/disable-flaky-tests.diff | 13 +++++++++++++
 tests/junit-subsequentcheck      |  3 +++
 3 files changed, 19 insertions(+)

diff --cc changelog
index 760b805,21f8d80..f350def
--- a/changelog
+++ b/changelog
@@@ -1,40 -1,30 +1,43 @@@
 -libreoffice (1:5.2.4-1) unstable; urgency=medium
 +libreoffice (1:5.3.0~rc1~git20161218-1) UNRELEASED; urgency=medium
  
 -  * New upstream release
 +  * New upstream snapshot
  
 -  * debian/patches/gtk3-opengl-slideshow.diff: add Fedora 25 patches
 -    (without the glew->epoxy move) backported from master to rework Diamond
 -    slide transition to use only OpenGL core (all we have in gtk3) and fix
 +  * 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/rules:
 -    - MYSQL_FLAVOUR=mysql on jessie-backports
 -    - ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too
    * debian/control.ogltrans.in:
      - add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
+   * debian/tests/junit-subsequentcheck:
+     - apply disable-flaky-tests.diff
  
 - -- Rene Engelhard <rene at debian.org>  Mon, 19 Dec 2016 13:52:51 +0100
 +  * 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
  
 -libreoffice (1:5.2.4~rc1-1) unstable; urgency=low
 + -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:35:52 +0100
  
 -  * New upstream release candidate
 -    - fixes (experimental) Gtk print dialog crash (closes: #839701)
 -    - fixes copy paste cells between two tables of two documents with Gtk3
 -      (closes: #834622)
 -    - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
 +libreoffice (1:5.3.0~beta2-1) experimental; urgency=medium
 +
 +  * New upstream beta release
 +
 +  * debian/patches/m68k-alignment.diff: add patch from John Paul Adrian
 +    Glaubitz to fix m68k alignment
 +
 +  * debian/libreoffice-sdbc-firebird.NEWS: add NEWS entry about the format
 +    incompatibility
 +  * debian/rules: revert ENABLE_GDRIVE=y on arm* as chromium got uploaded
 +    without it to sid and it's gone from experimental again on those
 +
 + -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 10:40:18 +0100
 +
 +libreoffice (1:5.3.0~beta1-1) experimental; urgency=medium
 +
 +  * New upstream beta release
  
    * try using just the used tarballs to avoid confusion and to shrink the
      .orig (they are downloaded anyway and not in the .orig)
diff --cc patches/disable-flaky-tests.diff
index 9b330cc,fc9ae53..ff4dfdf
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@@ -162,5 -162,18 +162,18 @@@ index 54eed4d..78019bd 10064
  +//#endif
  +//}
   
 - DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
 - {
 + #endif
 + 
+ diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
+ index 1c3925f..a16f001 100644
+ --- a/svx/qa/unoapi/svx.sce
+ +++ b/svx/qa/unoapi/svx.sce
+ @@ -25,7 +25,7 @@
+  #i111216 -o svx.AccessiblePresentationGraphicShape
+  #i111216 -o svx.AccessiblePresentationOLEShape
+  #i85539 -o svx.AccessiblePresentationShape
+ --o svx.AccessibleShape
+ +#-o svx.AccessibleShape
+  #i90294 -o svx.GraphicExporter
+  -o svx.SvxDrawPage
+  #i85501 -o svx.SvxGraphCtrlAccessibleContext

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