[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-169-g6214058
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 13af274ac106eb4b60571535a55e285261181f35
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Feb 13 13:33:09 2013 +0100
hacking around only core having a hotfixes tag
diff --git a/rules b/rules
index fc27981..6ed32ef 100755
--- a/rules
+++ b/rules
@@ -73,7 +73,7 @@ GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
lo_sources_ver=4.0.0.3
# 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)-hotfixes1
+GIT_TAG:=libreoffice-$(lo_sources_ver)
GIT_BRANCH=libreoffice-4-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
@@ -3175,7 +3175,7 @@ dh_testdir
TMPD=`mktemp -d $(if $(TMP),-p $(TMP))` && \
mkdir $${TMPD}/archive && \
git clone --bare $(GIT_BASEURL)/$(1) $${TMPD}/repo -b $(GIT_BRANCH) && \
-git archive --remote $${TMPD}/repo --format=tar --prefix libreoffice-$(DEB_VERSION_UPSTREAM)/ $(GIT_TAG) |tar x -C $${TMPD}/archive && \
+git archive --remote $${TMPD}/repo --format=tar --prefix libreoffice-$(DEB_VERSION_UPSTREAM)/ $(GIT_TAG)$(if $(filter $(1),core),-hotfixes1) |tar x -C $${TMPD}/archive && \
tar cvJf $(2) -C $${TMPD}/archive/$(3) --transform 's,./,,' . && \
rm -rf $${TMPD}
endef
--
LibreOffice packaging repository
Reply to: