[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-169-g6214058
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit e3ef4d55914b2b340fd754431e052abb59366b0f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Feb 27 03:23:54 2013 +0100
drop gio/gvfs check to a warning for tarball generation
also still use with/without patsubst for tarball generation
diff --git a/changelog b/changelog
index fd3fac1..5cd9287 100644
--- a/changelog
+++ b/changelog
@@ -37,20 +37,20 @@ libreoffice (1:4.0.1~rc1-2ubuntu1~ppa1) raring; urgency=low
- Ubuntu backport fixes
- reduced l10n for ppa builds
- alternatively allow firefox-dev to xulrunner-dev as build-dep
- - abort early on GVFS and GIO in same build
+ - warn early on GVFS and GIO in same build
- generate transitionals
- generate subsequentcheckbase
- fix missing closing para wrt slide remote
- move sessioninstaller from -gtk to -gnome for gio deps
- move subsequentcheckbase jars to package
+ - use --with/without patsubst instead of all-tarballs
* removed delta:
- remove libreoffice-core postinst
- fixed gnu make version
- remove hotfixes get-orig-sources hack
- - using --with-all-tarballs now
- some whitespace
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 13 Feb 2013 14:42:23 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 27 Feb 2013 03:01:15 +0100
libreoffice (1:4.0.1~rc1-2) experimental; urgency=low
diff --git a/rules b/rules
index 674f184..79fd37c 100755
--- a/rules
+++ b/rules
@@ -1220,7 +1220,7 @@ endif
ifeq "$(ENABLE_GIO)" "y"
ifeq "$(ENABLE_GVFS)" "y"
- $(error GIO and GVFS cant be enabled at the same time!)
+ $(warn GIO and GVFS cant be enabled at the same time!)
endif
CONFIGURE_FLAGS += --enable-gio
BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
@@ -3244,8 +3244,8 @@ $(call get_orig_tarball,-src): helpcontent2/makefile.pmk translations/makefile.m
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
- ./autogen.sh --with-all-tarballs
- $(MAKE) download
+ ./autogen.sh $(patsubst --with-system-%,--without-system-%,$(filter-out --disable-fetch-external,$(CONFIGURE_FLAGS))) --with-system-mysql
+ $(MAKE) download gb_LO_VER=$(DEB_VERSION_UPSTREAM)
tar cvJf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
# using flag files for unpacking
--
LibreOffice packaging repository
Reply to: