[libreoffice] 01/02: start 5.5 branch

[Rene Engelhard]

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

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

commit ff8585a0713c0d6f90cd6b92661df336d2e9c07a
Author: Rene Engelhard <rene at debian.org>
Date:   Mon May 22 20:15:06 2017 +0200

    start 5.5 branch
---
 changelog | 6 ++++++
 rules     | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index b04ea4d..01adfc0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.5.0~alpha0~git20170518-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
+
 libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
 
   * New upstream beta release
diff --git a/rules b/rules
index 3ec89da..f7361fc 100755
--- a/rules
+++ b/rules
@@ -22,8 +22,8 @@ CURDIR ?= $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/..)
 BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d: -f1):$(DEB_VERSION_UPSTREAM)
 BINARY_VERSION=$(DEB_VERSION)
 #HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
-HELP_L10N_VIRTUAL_VERSION:=5.4
-OOVER:=5.4
+HELP_L10N_VIRTUAL_VERSION:=5.5
+OOVER:=5.5
 NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
 
 ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@ -71,7 +71,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-4
+GIT_BRANCH=master
 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