[libreoffice] 01/04: merge get-orig-source fixes from Ubuntu and set TARFILE_LOCATION to tarballs instead of external/tarballs
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 32cb76a25539579f917b9ad022987a57c85c6cbf
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 22 12:19:46 2015 +0200
merge get-orig-source fixes from Ubuntu and set TARFILE_LOCATION to tarballs instead of external/tarballs
---
changelog | 6 +++++-
rules | 23 +++++++++++------------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/changelog b/changelog
index 2ea0c11..68fcffe 100644
--- a/changelog
+++ b/changelog
@@ -11,6 +11,9 @@ libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
anyway) and coinmp
- fix autogen.sh for autopkgtests by exporting the needed env vars there,
too
+ - set TARFILE_LOCATION to tarballs instead of external/tarballs and keep
+ external/ in the "main" orig wo we can just use it unchanged and keep
+ the upstream signature
* debian/tests/control, debian/tests/pyuno-import: add trivial import uno;
test for python3-uno
@@ -18,8 +21,9 @@ libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
* merge from Ubuntu:
- autopkgtest updates/fixes
- add ENABLE_LTO conditional, off
+ - get-orig-source fixes
- -- Rene Engelhard <rene@debian.org> Wed, 12 Aug 2015 15:23:58 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 22 Aug 2015 12:08:04 +0200
libreoffice (1:5.0.1~rc1-2) unstable; urgency=medium
diff --git a/rules b/rules
index 3aacd39..fad34b2 100755
--- a/rules
+++ b/rules
@@ -63,7 +63,7 @@ export QUILT_OPTIONS="-p1 -F0"
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
-TARFILE_LOCATION=$(CURDIR)/external/tarballs
+TARFILE_LOCATION=$(CURDIR)/tarballs
export TARFILE_LOCATION
USE_SOURCE_TARBALLS=n
USE_GIT_TARBALLS=n
@@ -3476,13 +3476,13 @@ $(call get_orig_tarball,-%):
$(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/)
# Get upstream external sources
-$(call get_orig_tarball,-external): helpcontent2/makefile.pmk translations/makefile.mk .gitignore
+$(call get_orig_tarball,-tarballs): helpcontent2/makefile.pmk translations/makefile.mk .gitignore
dh_testdir
- rm -rf $(TARFIILE_LOCATION)
- mkdir -p $(TARFILE_LOCATION)
- ./autogen.sh --with-all-tarballs
- $(MAKE) download
- tar cvJf $@ -C external --transform 's,./,,' .
+ rm -rf tarballs
+ mkdir -p tarballs
+ ./autogen.sh $(filter-out --disable-fetch-external,$(CONFIGURE_FLAGS)) --with-all-tarballs
+ $(MAKE) download gb_LO_VER=$(DEB_VERSION_UPSTREAM)
+ tar cvJf $@ -C src --transform 's,./,,' .
# using flag files for unpacking
.gitignore: $(call get_orig_tarball)
@@ -3494,18 +3494,17 @@ translations/makefile.mk: $(call get_orig_tarball,-translations)
helpcontent2/makefile.pmk: $(call get_orig_tarball,-helpcontent2)
$(call unpack_gittarball,helpcontent2,$<,)
-external/tarballs/fetch.log: $(call get_orig_tarball,-external) patched
- $(call unpack_gittarball,external,$<,)
+tarballs/fetch.log: $(call get_orig_tarball,-tarballs) patched
+ $(call unpack_gittarball,src,$<,)
-get-orig-source: $(call get_orig_tarball,-external) external/tarballs/fetch.log
+get-orig-source: $(call get_orig_tarball,-tarballs) tarballs/fetch.log
dh_testdir
-unpack: external/fetch.log
+unpack: tarballs/fetch.log
dh_testdir
endif
endif
-
.PHONY: control
.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default
.PHONY: prepare build build-indep build-arch install-arch install-indep
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: