[libreoffice] 140/152: Merge tag 'libreoffice_5.3.0_rc2-1' into ubuntu-zesty-5.3

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit a47eac78f6d00c8f5ac144092a81ac5e2a79ad29
Merge: 2c0605e 4fdc2c2
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jan 24 12:58:19 2017 +0100

    Merge tag 'libreoffice_5.3.0_rc2-1' into ubuntu-zesty-5.3
    
    tag libreoffice 1:5.3.0~rc2-1

 changelog                                      | 16 +++++-
 patches/change-from-glew-to-epoxy.diff         | 66 +++++++++++++++++++++++
 patches/m68k-use-mlong-jump-table-offsets.diff | 74 ++++++++++++++++++++++++++
 patches/series                                 |  1 +
 rules                                          | 19 ++++---
 5 files changed, 168 insertions(+), 8 deletions(-)

diff --cc changelog
index 38e7cbb,88c0f3d..5f07ffb
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,17 +1,36 @@@
- libreoffice (1:5.3.0~rc1-2ubuntu1~zesty3) zesty; urgency=medium
++libreoffice (1:5.3.0~rc2-2ubuntu1~zesty1) zesty; urgency=medium
 +
 +  * go full gtk3
 +  * remove remaining BUILD_DBG_PACKAGE parts
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 24 Jan 2017 12:49:45 +0100
 +
+ libreoffice (1:5.3.0~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/change-from-glew-to-epoxy.diff: update
+   * debian/patches/m68k-use-mlong-jump-table-offsets.diff: add;
+     as name says
+ 
+   * debian/rules:
+     - build-depend on gcc-7/g++-7 (>= 7-20170106) for m68k for
+       -mlong-jump-table-offsets
+ 
+  -- Rene Engelhard <rene at debian.org>  Tue, 17 Jan 2017 01:31:09 +0100
+ 
 +libreoffice (1:5.3.0~rc1-2ubuntu1~zesty2) zesty; urgency=medium
 +
 +  * allow root builds on lp 
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Mon, 23 Jan 2017 17:58:32 +0100
 +
 +libreoffice (1:5.3.0~rc1-2ubuntu1~zesty1) zesty; urgency=medium
 +
 +  * merge from Debian
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 10 Jan 2017 12:19:56 +0100
 +
  libreoffice (1:5.3.0~rc1-2) experimental; urgency=medium
  
    * debian/rules:
diff --cc patches/series
index a96196d,15eb4aa..939028f
--- a/patches/series
+++ b/patches/series
@@@ -31,7 -33,4 +31,8 @@@ no-openssl.dif
  m68k-alignment.diff
  change-from-glew-to-epoxy.diff
  gtk3-opengl-slideshow.diff
+ m68k-use-mlong-jump-table-offsets.diff
 +allow-root-builds-on-lp.diff
 +#lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 +#integraltrans.diff
 +#mysqlc-boost-fallthrough.diff
diff --cc rules
index c1efa7e,fd5a901..ddea0cb
--- a/rules
+++ b/rules
@@@ -68,9 -67,7 +68,9 @@@ USE_SOURCE_TARBALLS=
  USE_GIT_TARBALLS=n
  ifeq "$(USE_GIT_TARBALLS)" "y"
  GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
 -lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
 +# bootstraping this from the source tree is breaking get-orig-source
 +#lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
- lo_sources_ver=5.3.0.1
++lo_sources_ver=5.3.0.2
  # NOT in proper libreoffice-3-6 branch
  # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
  GIT_TAG=libreoffice-$(lo_sources_ver)

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