[libreoffice] 01/01: update OOVER ans git infos
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 f8a19a09e63008301aaf1adee997bedd3a124c9f
Author: Rene Engelhard <rene@debian.org>
Date: Mon Feb 22 09:30:38 2016 +0100
update OOVER ans git infos
---
control | 2 +-
control.in | 2 +-
rules | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/control b/control
index d22a237..aa5d065 100644
--- a/control
+++ b/control
@@ -184,7 +184,7 @@ Build-Conflicts: amd-libopencl1,
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.2
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
diff --git a/control.in b/control.in
index 04e79fa..7920fa3 100644
--- a/control.in
+++ b/control.in
@@ -26,7 +26,7 @@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
amd-libopencl1,
nvidia-libopencl1
Standards-Version: 3.9.4
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.2
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs: @BUGS@
Homepage: http://www.libreoffice.org
diff --git a/rules b/rules
index 8b2d75d..769f2ad 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.1
-OOVER:=5.1
+HELP_L10N_VIRTUAL_VERSION:=5.2
+OOVER:=5.2
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@ -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-1-1
+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
Reply to: