[libreoffice] 02/06: fix tarball creation w/ system libs

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_5.0.2_rc2-0ubuntu2
in repository libreoffice.

commit a199c0105282eb340c230b8d838e9f13fc13fa3a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Oct 28 21:10:00 2015 +0100

    fix tarball creation w/ system libs
---
 rules | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules b/rules
index 68b0beb..368b804 100755
--- a/rules
+++ b/rules
@@ -3287,12 +3287,16 @@ $(call get_orig_tarball,-src): helpcontent2/makefile.pmk translations/makefile.m
 	dh_testdir
 	rm -rf src
 	mkdir -p src
+	patch -p1 <debian/patches/liborcus-0.9.1.diff
+	patch -p1 <debian/patches/fix-system-lpsolve-build.diff
 	./autogen.sh $(filter-out --disable-fetch-external,$(CONFIGURE_FLAGS)) --with-all-tarballs
 	$(MAKE) download gb_LO_VER=$(DEB_VERSION_UPSTREAM)
 	# removing the biggest internal tarballs to keep the source tree size
 	# reasonable -- we likely never want to use those internal anyway
 	rm $(foreach tarball,*-boost_* *-JLanguageTool-* *-cairo-* *-icu4c-* *-postgresql-* Python-* *-dbghelp.dll *cros* *source*font* *deja* *gentium*font* *liberation* *Libertine* *open-sans-font* *pt-serif-font*,src/$(tarball))
 	tar cvJf $@ -C src --transform 's,./,,' .
+	patch -Rp1 <debian/patches/fix-system-lpsolve-build.diff
+	patch -Rp1 <debian/patches/liborcus-0.9.1.diff
 
 # using flag files for unpacking
 .gitignore: $(call get_orig_tarball)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git