[libreoffice] 01/03: Merge remote-tracking branch 'origin/master' into debian-experimental-5.3

Sun Dec 18 20:13:34 UTC 2016

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 7a006c726175372ebceb6020ccaca5cb0297f615
Merge: a1e527f de65cee
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Dec 18 20:55:55 2016 +0100

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

 changelog                          |  14 +
 control                            |   2 +
 control.ogltrans.in                |   1 +
 patches/gtk3-opengl-slideshow.diff | 632 +++++++++++++++++++++++++++++++++++++
 patches/series                     |   1 +
 rules                              |   5 +
 tests/control                      |   2 +-
 7 files changed, 656 insertions(+), 1 deletion(-)

diff --cc changelog
index ff07245,0ec76a4..85683e2

--- a/changelog
+++ b/changelog
@@@ -1,20 -1,26 +1,34 @@@
 -libreoffice (1:5.2.4~rc2-1) UNRELEASED; urgency=medium
++libreoffice (1:5.3.0~rc1~git20161218-1) UNRELEASED; urgency=medium
+ 
 -  * New upstream release candidate
++  * New upstream snapshot
+ 
+   * debian/patches/gtk3-opengl-slideshow.diff: add Fedora 25 patches
+     backported from master to rework Diamond slide transition to use only
+     OpenGL core (all we have in gtk3) and fix ogltrans generically with gtk3
+     (without the glew->epoxy move)
+ 
 -  * debian/rules:
 -    - MYSQL_FLAVOUR=mysql on jessie-backports
+   * debian/control.ogltrans.in:
+     - add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
+ 
+  -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:31:35 +0100
+ 
 -libreoffice (1:5.2.4~rc1-1) unstable; urgency=low
 +libreoffice (1:5.3.0~beta2-1) experimental; urgency=medium
  
 -  * 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)
 +  * 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 control
index fc1a040,829bfb1..7a2c3ec
--- a/control
+++ b/control
@@@ -67,7 -70,9 +67,8 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
                 libfontconfig1-dev,
                 libfreehand-dev (>= 0.1),
                 libfreetype6-dev (>= 2.2.0),
 -               libgcj-common (>= 1:4.4.1) [hppa ia64 s390 sparc],
                 libgirepository1.0-dev (>= 1.32),
+                libgl1-mesa-dev,
                 libglew-dev,
                 libglib2.0-dev (>= 2.15.0),
                 libglm-dev (>= 0.9.6.3),
diff --cc patches/series
index a80cf4b,9f15842..c1a0d19
--- a/patches/series
+++ b/patches/series
@@@ -28,6 -29,9 +28,7 @@@ hppa-is-32bit.dif
  rsc-no-error-about-unknown-switch.diff
  debian-branding.diff
  no-packagekit-per-default.diff
 -sparc64.diff
 -startcenter-grey-out-not-installed.diff
 +system-officeotron-and-odfvalidator.diff
  no-openssl.diff
 -m68k-java-arch.diff
 +m68k-alignment.diff
+ gtk3-opengl-slideshow.diff
diff --cc rules
index 3022c05,a93e9b4..ffa22ca
--- a/rules
+++ b/rules
@@@ -406,9 -415,13 +407,13 @@@ els
  CPPUNIT_MINVER=0.12
  endif
  DEFAULT_IMAGE=galaxy
 -IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
 +IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze breeze_dark
  ENABLE_MYSQLNATIVE=y
+ ifneq "$(JESSIE_BACKPORT)" "y"
  MYSQL_FLAVOUR=default
+ else
+ MYSQL_FLAVOUR=mysql
+ endif
  # set this also to y for system-mysql..
  SYSTEM_STUFF += mariadb
  SYSTEM_STUFF += mysql-cppconn
diff --cc tests/control
index a61cdad,04766f6..cbc2773
--- a/tests/control
+++ b/tests/control
@@@ -1,5 -1,5 +1,5 @@@
  Tests: junit-subsequentcheck
- Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg [...]
 -Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencolla [...]
++Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2014 [...]
  
  Tests: pyuno-import
  Depends: python3-uno

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

