[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-3-123-gc3618b9
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 0bfb0182aa43d9558703524b4fe99799d5e49f47
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue May 29 21:52:24 2012 +0200
git dailies
diff --git a/rules b/rules
index 064d248..fb3de93 100755
--- a/rules
+++ b/rules
@@ -70,10 +70,11 @@ USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
lo_sources_ver=3.5.99.1
-# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.5.99.1 libreoffice-3.5.99.1
-#GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6
+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
Reply to: