[libreoffice] 01/01: update to libreoffice-6-0 branch

Rene Engelhard rene at moszumanska.debian.org
Sat Nov 25 16:13:53 UTC 2017


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

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

commit 54dd8b5c40dc4711df76111d91f589af3a060e1f
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 25 17:13:43 2017 +0100

    update to libreoffice-6-0 branch
---
 changelog               | 2 +-
 rules                   | 2 +-
 source/include-binaries | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index d9a08b2..e833c4d 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~beta1~git20171120-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta1~git20171125-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/rules b/rules
index dbc9de7..079aa18 100755
--- a/rules
+++ b/rules
@@ -74,7 +74,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=master
+GIT_BRANCH=libreoffice-6-0
 endif
 ifeq "$(USE_SOURCE_TARBALLS)" "y"
 lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
diff --git a/source/include-binaries b/source/include-binaries
index dd22add..343b412 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,4 +5,3 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/pdfium-3235.tar.bz2
-uitest/writer_tests/data/3pages.odt

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



More information about the Pkg-openoffice-commits mailing list