[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-137-g1e23764
The following commit has been merged in the debian-experimental-3.5 branch:
commit 42a006d09774878b9f1d6a9b29853c5d56e0e652
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Dec 16 03:05:34 2011 +0100
patch before configure
diff --git a/rules b/rules
index 88bd8fa..1247d7a 100755
--- a/rules
+++ b/rules
@@ -3281,7 +3281,7 @@ translations/makefile.mk: $(call get_orig_tarball,-translations)
helpcontent2/makefile.pmk: $(call get_orig_tarball,-helpcontent2)
$(call unpack_gittarball,helpcontent2,$<,)
-ext-sources/fetch.log: $(call get_orig_tarball,-ext-sources)
+ext-sources/fetch.log: $(call get_orig_tarball,-ext-sources) patched
$(call unpack_gittarball,ext-sources,$<,)
get-orig-source: $(call get_orig_tarball,-ext-sources) ext-sources/fetch.log
@@ -3289,12 +3289,15 @@ 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:| $(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)
+config.status : patched
endif
@@ -3302,7 +3305,7 @@ endif
.PHONY: control
.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default configure
.PHONY: build build-indep build-arch install-arch install-indep
-.PHONY: get-orig-source unpack
+.PHONY: get-orig-source unpack patched
.PHONY: $(stampdir_targets)
# vim:set noet ai sts=8 sw=8 tw=0:
--
LibreOffice packaging repository
Reply to: