[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-137-g1e23764

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.5 branch:
commit 98041a6a10d894f9e8a609edd2060f8ac08a7860
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Dec 15 20:48:09 2011 +0100

    USE_GIT_TARBALLS for upstream tarballs

diff --git a/rules b/rules
index 6da8b18..bf016b0 100755
--- a/rules
+++ b/rules
@@ -75,7 +75,8 @@ SOURCE_TREE=.
 STAMP_DIR=debian/stampdir
 TARFILE_LOCATION=$(CURDIR)/ext-sources
 export TARFILE_LOCATION
-USE_SOURCE_TARBALLS=y
+USE_SOURCE_TARBALLS=n
+USE_GIT_TARBALLS=y
 
 ifeq "$(DISTREL)" "squeeze"
  SQUEEZE_BACKPORT=y
@@ -3212,7 +3213,7 @@ endif
 
 binary: binary-arch binary-indep
 
-ifeq "$(USE_SOURCE_TARBALLS)" "y"
+ifeq "$(USE_GIT_TARBALLS)" "y"
 
 # $(1) is the upstream name of the repo
 # $(2) is the name of the tarball
@@ -3243,9 +3244,10 @@ endef
 define unpack_gittarball
 dh_testdir
 mkdir -p $(CURDIR)/$(1)
-tar xvzf $(2) -C $(CURDIR)/$(1) $(3)
+test -f $(CURDIR)/$(1)/.gitignore || tar xvzf $(2) -C $(CURDIR)/$(1) $(3)
 endef
 
+ifneq ($(filter get-orig-source unpack,$(MAKECMDGOALS)),)
 $(call get_orig_tarball):
 	$(call pack_gittarball,core,$@,)
 
@@ -3256,18 +3258,13 @@ $(call get_orig_tarball,-%):
 	$(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/$*)
 
 # Get upstream external sources
-$(call get_orig_tarball,-ext-sources):| config.status
+$(call get_orig_tarball,-ext-sources): config.status
 	dh_testdir
 	rm -rf $(TARFIILE_LOCATION)
 	mkdir -p $(TARFILE_LOCATION)
 	./download
 	tar cvzf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
 
-config.status:| $(foreach tarball,binfilter dictionaries helpcontent2 translations,$(tarball)/.gitignore $(call get_orig_tarball,-$(tarball)))
-config.status:| .gitignore $(call get_orig_tarball)
-
-endif
-
 # using .gitignore/fetch.log as flag files for unpacking
 .gitignore: $(call get_orig_tarball)
 	$(call unpack_gittarball,,$<,--strip-components=1)
@@ -3278,13 +3275,19 @@ endif
 ext-sources/fetch.log: $(call get_orig_tarball,-ext-sources)
 	$(call unpack_gittarball,ext-sources,$<,)
 
-
 get-orig-source: $(call get_orig_tarball,-ext-sources)
 	dh_testdir
 
 unpack: ext-sources/fetch.log
 	dh_testdir
 
+endif
+
+config.status:| $(foreach tarball,binfilter dictionaries helpcontent2 translations,$(tarball)/.gitignore $(call get_orig_tarball,-$(tarball)))
+config.status:| .gitignore $(call get_orig_tarball)
+
+endif
+
 
 .PHONY: control
 .PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default configure

-- 
LibreOffice packaging repository