[libreoffice] 01/03: 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 114c4ee264e0df253ed6bfd301ae0df87017bf5d
Merge: cf1a62a a1e527f
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 13 20:04:15 2016 +0100

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

 changelog                    |  13 +++--
 control                      |   6 +--
 control.in                   |   2 +-
 copyright                    |   1 -
 patches/m68k-alignment.diff  | 112 +++++++++++++++++++++++++++++++++++++++++++
 patches/series               |   1 +
 rules                        |  21 +++-----
 shlibs.override.mysqlcppconn |   1 -
 tests/control                |   2 +-
 uno-libs3.symbols            |   1 +
 10 files changed, 133 insertions(+), 27 deletions(-)

diff --cc changelog
index 4f97210,ff07245..07cfb3e
--- a/changelog
+++ b/changelog
@@@ -1,19 -1,16 +1,22 @@@
 +libreoffice (1:5.4.0~alpha0~git20161128-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~beta2~git20161128-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.3.0~beta2-1) experimental; urgency=medium
  
-   * New upstream snapshot
+   * New upstream beta release
+ 
+   * debian/patches/m68k-alignment.diff: add patch from John Paul Adrian
+     Glaubitz to fix m68k alignment
  
-   * debian/rules:
-     - fix typo in chromium build-deps: s/amd64/arm64/
    * 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>  Thu, 24 Nov 2016 07:27:55 +0100
+  -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 10:40:18 +0100
  
  libreoffice (1:5.3.0~beta1-1) experimental; urgency=medium
  

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