[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-177-g132031d
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 09807e43de6fd434c950db1d9a6206f532479a87
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Mar 5 19:07:56 2013 +0100
use --with-all-tarballs
diff --git a/changelog b/changelog
index 57dd0a5..7101b37 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,9 @@
libreoffice (1:4.0.1~rc1-2ubuntu1~ppa2) UNRELEASED; urgency=low
* brown paperbag: fixed the (LP: #780399)
+ * use --with-all-tarballs in addition to our flags for getting the source
+ - this is so that ./configure doesnt stumble over other checks
+ - e.g. still needing gnomevfs
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 05 Mar 2013 18:49:03 +0100
diff --git a/rules b/rules
index ad74f79..81b62eb 100755
--- a/rules
+++ b/rules
@@ -3244,7 +3244,7 @@ $(call get_orig_tarball,-src): helpcontent2/makefile.pmk translations/makefile.m
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
- ./autogen.sh $(patsubst --with-system-%,--without-system-%,$(filter-out --disable-fetch-external,$(CONFIGURE_FLAGS))) --with-system-mysql
+ ./autogen.sh $(filter-out --disable-fetch-external,$(CONFIGURE_FLAGS)) --with-all-tarballs
$(MAKE) download gb_LO_VER=$(DEB_VERSION_UPSTREAM)
tar cvJf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
--
LibreOffice packaging repository
Reply to: