[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-101-gc1ab6d0
The following commit has been merged in the debian-experimental-3.5 branch:
commit 7b9d86c861838d61300373aa08a79b49345a6b03
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Nov 22 22:41:54 2011 +0100
comment about get-orig-source only working in the right dir
diff --git a/rules b/rules
index 7e15de3..967f01b 100755
--- a/rules
+++ b/rules
@@ -3236,11 +3236,20 @@ endif
binary: binary-arch binary-indep
ifneq "$(SOURCE_TARBALLS)" "y"
+
# $(1) is the upstream name of the repo
# $(2) is the location where the contents of the tarball end up relative to CURDIR (might be empty)
# $(3) is the name of the tarball
+#
+# according to policy get-orig-source has to download to the current dir, thus
+# should not require a dh_testdir. However, like this we can have clean deps
+# from build and download the source, configure, build, pack in on piece. As
+# get-orig-source is an optional target anyway, we stick to support only this
+# case and not random dirs. see also: debian bug 494141
+
define pack_gittarball
+dh_testdir
if ! which git >/dev/null 2>/dev/null; then \
echo "You need git."; \
exit 1; \
@@ -3278,6 +3287,7 @@ $(CURDIR)/../libreoffice_$(DEB_VERSION_UPSTREAM).orig-ext-sources.tar.gz: config
tar cfvz $@ -C $(dir $(TARFILE_LOCATION)) $(notdir $(TARFILE_LOCATION))
rm -f ooo.lst
+
get-orig-source: $(CURDIR)/../libreoffice_$(DEB_VERSION_UPSTREAM).orig-ext-sources.tar.gz
endif
--
LibreOffice packaging repository
Reply to: