[libreoffice] 01/02: 5.2.5 rc1

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit 4a1ff64c991bdcc4dad3688f23f01226b564765a
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jan 12 07:58:42 2017 +0100

    5.2.5 rc1
---
 changelog                          | 6 ++++++
 patches/gtk3-opengl-slideshow.diff | 2 +-
 rules                              | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 0537919..5e17004 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.2.5~rc1-1) unstable; urgency=medium
+
+  * New upstream release candidate
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 12 Jan 2017 07:57:25 +0100
+
 libreoffice (1:5.2.4-2) unstable; urgency=medium
 
   * debian/tests/junit-subsequentcheck:
diff --git a/patches/gtk3-opengl-slideshow.diff b/patches/gtk3-opengl-slideshow.diff
index 2eb12ee..9c825a1 100644
--- a/patches/gtk3-opengl-slideshow.diff
+++ b/patches/gtk3-opengl-slideshow.diff
@@ -57,7 +57,7 @@ index 8b508c6..9eb1e51 100644
 +    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
 +
      CHECK_GL_ERROR();
-     glDrawArrays( GL_TRIANGLES, 0, getVerticesSize() );
+     glDrawArrays( GL_TRIANGLES, 0, Vertices.size() );
      CHECK_GL_ERROR();
 -    glPopClientAttrib();
 +
diff --git a/rules b/rules
index 581fb85..9d05252 100755
--- a/rules
+++ b/rules
@@ -71,8 +71,8 @@ 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,\],,')
 # 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)-buildfix1
-GIT_BRANCH=libreoffice-5-2-4
+GIT_TAG=libreoffice-$(lo_sources_ver)
+GIT_BRANCH=libreoffice-5-2-5
 endif
 ifeq "$(USE_SOURCE_TARBALLS)" "y"
 lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)

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