[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-163-ged06f67
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 906267f117864da028a97812e737a720ddac3b93
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jul 18 12:57:48 2012 +0200
update to rc2, disable reportbuilder as it needs 17 MIRs
diff --git a/changelog b/changelog
index 451f2f9..9897005 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,11 @@
-libreoffice (1:3.6.0~rc1-0ubuntu1) quantal; urgency=low
+libreoffice (1:3.6.0~rc2-0ubuntu1) quantal; urgency=low
* new upstream rc
* switch to libservlet 3.0 API (LP: #1023405)
* revert 78c2f91bd0ba744ddacb908457a18ca6537c8017
+ * temp. disable reportbuilder for it needs 17 MIRs still
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 17 Jul 2012 17:14:10 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 18 Jul 2012 12:54:24 +0200
libreoffice (1:3.6.0~beta3-0ubuntu1~ppa1) quantal; urgency=low
diff --git a/rules b/rules
index 9045b23..d7c405e 100755
--- a/rules
+++ b/rules
@@ -69,7 +69,7 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver:=3.6.0.1
+lo_sources_ver:=3.6.0.2
GIT_TAG:=libreoffice-$(lo_sources_ver)
GIT_BRANCH=libreoffice-3.6
ifneq ($(findstring ~git,$(DEB_VERSION_UPSTREAM)),)
@@ -516,6 +516,8 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ifeq ($(DISTREL),quantal)
FORCE_LIBSERVLET3:=y
endif
+ # too much MIRs for the initial upload
+ ENABLE_REPORTDESIGN=n
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
--
LibreOffice packaging repository
Reply to: