[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 70660263918113d090843c2445bfa0d3760b57b4
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Dec 16 00:07:49 2011 +0100

    .gitignore is unfortunately not a suitable flagfile in subdirs

diff --git a/rules b/rules
index bf016b0..88bd8fa 100755
--- a/rules
+++ b/rules
@@ -3258,24 +3258,33 @@ $(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,./,,' .
 
-# using .gitignore/fetch.log as flag files for unpacking
+# using flag files for unpacking
 .gitignore: $(call get_orig_tarball)
 	$(call unpack_gittarball,,$<,--strip-components=1)
 
-%/.gitignore: $(call get_orig_tarball,-%)
-	$(call unpack_gittarball,$*,$<,)
+binfilter/no_localization: $(call get_orig_tarball,-binfilter)
+	$(call unpack_gittarball,binfilter,$<,)
+
+dictionaries/en/README.txt: $(call get_orig_tarball,-dictionaries)
+	$(call unpack_gittarball,dictionaries,$<,)
+
+translations/makefile.mk:  $(call get_orig_tarball,-translations)
+	$(call unpack_gittarball,translations,$<,)
+
+helpcontent2/makefile.pmk:  $(call get_orig_tarball,-helpcontent2)
+	$(call unpack_gittarball,helpcontent2,$<,)
 
 ext-sources/fetch.log: $(call get_orig_tarball,-ext-sources)
 	$(call unpack_gittarball,ext-sources,$<,)
 
-get-orig-source: $(call get_orig_tarball,-ext-sources)
+get-orig-source: $(call get_orig_tarball,-ext-sources) ext-sources/fetch.log
 	dh_testdir
 
 unpack: ext-sources/fetch.log
@@ -3283,7 +3292,8 @@ unpack: ext-sources/fetch.log
 
 endif
 
-config.status:| $(foreach tarball,binfilter dictionaries helpcontent2 translations,$(tarball)/.gitignore $(call get_orig_tarball,-$(tarball)))
+config.status:| $(foreach tarball,binfilter dictionaries helpcontent2 translations,$(call get_orig_tarball,-$(tarball)))
+config.status:| binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk
 config.status:| .gitignore $(call get_orig_tarball)
 
 endif

-- 
LibreOffice packaging repository