The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit e8438cacf7645582d8974493c250f42426f808de
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Tue May 29 21:52:24 2012 +0200
git dailies
diff --git a/rules b/rules
index f02b88c..564cb9d 100755
--- a/rules
+++ b/rules
@@ -74,6 +74,9 @@ lo_sources_ver=3.6.0.0.beta2
# use ./g checkout -b tag-libreoffice-3.6.0.0.beta2 libreoffice-3.6.0.0.beta2
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=libreoffice-3-6
+ifneq ($(findstring ~git,$(DEB_VERSION_UPSTREAM)),)
+GIT_TAG=master
+endif
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sjs7w-0006it...@vasks.debian.org
