[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-138-gb94d361
The following commit has been merged in the debian-experimental-3.5 branch:
commit b94d36199d15d77672bbe54bcc2a50f07c24b1f9
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Dec 16 13:26:40 2011 +0100
ext-sources should even contain optional internal source tarballs to allow switching
diff --git a/rules b/rules
index b6102ab..54e330b 100755
--- a/rules
+++ b/rules
@@ -3258,10 +3258,11 @@ $(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): binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
+ ./autogen.sh
./download
tar cvjf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
@@ -3290,15 +3291,6 @@ get-orig-source: $(call get_orig_tarball,-ext-sources) ext-sources/fetch.log
unpack: ext-sources/fetch.log
dh_testdir
endif
-patched:| $(foreach tarball,binfilter dictionaries helpcontent2 translations,$(call get_orig_tarball,-$(tarball))) $(call get_orig_tarball)
-patched: binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
-
-patched:
- dh_testdir
- quilt push -a || true
-
-config.status : patched
-
endif
--
LibreOffice packaging repository
Reply to: