[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 22/23: disable checks on alpha release



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

sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.

commit ffba2f80097aebc00d61d815ba544397b755d765
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Nov 11 16:12:39 2013 +0100

    disable checks on alpha release
---
 rules |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules b/rules
index 6a4214e..8eadf54 100755
--- a/rules
+++ b/rules
@@ -593,7 +593,6 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   IMAGES+=human
   CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
   ENABLE_FIREBIRD=n
-  SYSTEM_STUFF := $(filter-out libcmis mdds libetonyek libfreehand, $(SYSTEM_STUFF))
   # lp#1034560: MIR troubles make it easier to use internal jfreereport
   SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
   ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
@@ -617,10 +616,11 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   endif
   #temp. hacks
   ENABLE_EVO2:=n
-  SYSTEM_STUFF := $(filter-out libodfgen libmwaw, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libcmis mdds libodfgen libmwaw libetonyek libfreehand, $(SYSTEM_STUFF))
   ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
     ENABLE_HELP=n
   endif
+  RUN_MAKE_CHECK=n
 endif
 
 CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))

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


Reply to: