[libreoffice] 01/01: Revert "Revert "git update; close #839701""

[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 7e311ce08df08b3bfb5bf02f2eef839947789322
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Oct 19 23:30:16 2016 +0200

    Revert "Revert "git update; close #839701""
    
    This reverts commit 0a69aa35ebf5e8a0370da9c0c0b6c07062f5082d.
    
    Conflicts:
    	changelog
---
 changelog | 7 +++++++
 rules     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 32971df..c0c5057 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.2.4~rc1~git20161013-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+    - fixes (experimental) Gtk print dialog crash (closes: #839701)
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
+
 libreoffice (1:5.2.3~rc1-3) unstable; urgency=medium
 
   * debian/patches/fix-system-lpsolve-build.diff: fix -L in configure.ac so
diff --git a/rules b/rules
index 527b5d6..95e50f1 100755
--- a/rules
+++ b/rules
@@ -72,7 +72,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf
 # 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)
-GIT_BRANCH=libreoffice-5-2-3
+GIT_BRANCH=libreoffice-5-2
 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