[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



The following commit has been merged in the debian-experimental-3.5 branch:
commit 75784d593d70e60153777b8aead897fc2a4c93b3
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Wed Nov 30 00:45:13 2011 +0100

    only pack missing tarballs when USE_SOURCE_TARBALLS

diff --git a/rules b/rules
index ee01b70..d69b4c5 100755
--- a/rules
+++ b/rules
@@ -3240,7 +3240,7 @@ endif
 
 binary: binary-arch binary-indep
 
-ifneq "$(SOURCE_TARBALLS)" "y"
+ifeq "$(USE_SOURCE_TARBALLS)" "y"
 
 # $(1) is the upstream name of the repo
 # $(2) is the name of the tarball
@@ -3291,6 +3291,9 @@ $(call get_orig_tarball,-ext-sources):| config.status
 	./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
@@ -3303,8 +3306,6 @@ endif
 ext-sources/fetch.log: $(call get_orig_tarball,-ext-sources)
 	$(call unpack_gittarball,ext-sources,$<,)
 
-config.status:| $(foreach tarball,binfilter dictionaries helpcontent2 translations,$(tarball)/.gitignore $(call get_orig_tarball,-$(tarball)))
-config.status:| .gitignore $(call get_orig_tarball)
 
 get-orig-source: $(call get_orig_tarball,-ext-sources)
 	dh_testdir

-- 
LibreOffice packaging repository


Reply to: