[libreoffice] 02/02: fix git info (again)

[Rene Engelhard]

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

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

commit ca3e93bc8ce55c79f78975638f423bba76252551
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Nov 19 12:56:13 2017 +0100

    fix git info (again)
---
 changelog  | 2 +-
 control    | 2 +-
 control.in | 2 +-
 rules      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 3dc89d8..f82fa1c 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.4~rc1~git20171021-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.4~rc1~git20171119-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/control b/control
index f15b9b8..08fb146 100644
--- a/control
+++ b/control
@@ -187,7 +187,7 @@ Build-Conflicts: amd-libopencl1,
                  nvidia-glx-legacy-dev,
                  nvidia-libopencl1
 Standards-Version: 4.0.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 Bugs: 
 Homepage: http://www.libreoffice.org
diff --git a/control.in b/control.in
index 65fa184..dde2ae7 100644
--- a/control.in
+++ b/control.in
@@ -13,7 +13,7 @@ Build-Conflicts: g++-4.6 (= 4.6.1-10),
                  amd-libopencl1,
                  nvidia-libopencl1
 Standards-Version: 4.0.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 Bugs: @BUGS@
 Homepage: http://www.libreoffice.org
diff --git a/rules b/rules
index e7992b4..7765fca 100755
--- a/rules
+++ b/rules
@@ -73,8 +73,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)-hotfix1
-GIT_BRANCH=libreoffice-5-4-3
+GIT_TAG=libreoffice-$(lo_sources_ver)
+GIT_BRANCH=libreoffice-5-4
 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