The following commit has been merged in the ubuntu-precise-3.5 branch:
commit b60016affffe2f204217a587bed9249e24cc3c21
Author: Bjoern Michaelsen <bjoern.michael...@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 2fa675a..b081843 100755
--- a/rules
+++ b/rules
@@ -3263,10 +3263,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,./,,' .
 
@@ -3295,15 +3296,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


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rbznk-0007l7...@vasks.debian.org

Reply via email to