[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.4.4-1-145-gb60016a
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 71e8c6e2f5d00b55b238845ec4892339dd6be3ec
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Dec 16 13:22:24 2011 +0100
use bzip2 compression for tarballs
diff --git a/rules b/rules
index a557dae..2fa675a 100755
--- a/rules
+++ b/rules
@@ -3233,7 +3233,7 @@ ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_INSTALLED:=$(shell which git >/dev/null 2>/dev/null && echo "y")
-get_orig_tarball=$(CURDIR)/../libreoffice_$(DEB_VERSION_UPSTREAM).orig$(1).tar.gz
+get_orig_tarball=$(CURDIR)/../libreoffice_$(DEB_VERSION_UPSTREAM).orig$(1).tar.bz2
define pack_gittarball
$(if $(GIT_INSTALLED),,$(error You need git.))
@@ -3242,14 +3242,14 @@ 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 && \
-tar cvzf $(2) -C $${TMPD}/archive/$(3) --transform 's,./,,' . && \
+tar cvjf $(2) -C $${TMPD}/archive/$(3) --transform 's,./,,' . && \
rm -rf $${TMPD}
endef
define unpack_gittarball
dh_testdir
mkdir -p $(CURDIR)/$(1)
-test -f $(CURDIR)/$(1)/.gitignore || tar xvzf $(2) -C $(CURDIR)/$(1) $(3)
+test -f $(CURDIR)/$(1)/.gitignore || tar xvjf $(2) -C $(CURDIR)/$(1) $(3)
endef
ifneq ($(filter get-orig-source unpack,$(MAKECMDGOALS)),)
@@ -3268,7 +3268,7 @@ $(call get_orig_tarball,-ext-sources): |config.status
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
./download
- tar cvzf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
+ tar cvjf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
# using flag files for unpacking
.gitignore: $(call get_orig_tarball)
--
LibreOffice packaging repository
Reply to: