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

[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8



The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit f64d35f1089ccf14f7dc5f90b720789a2a5d1d01
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Jun 7 21:01:36 2013 +0200

    build with internal versions for now

diff --git a/rules b/rules
index 96d901e..596b2cc 100755
--- a/rules
+++ b/rules
@@ -573,7 +573,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   ENABLE_MERGELIBS=y
   #temp. hacks
   ENABLE_EVO2:=n
-  SYSTEM_STUFF := $(filter-out boost, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libodfgen harfbuzz libmwaw mdds, $(SYSTEM_STUFF))
   ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
     ENABLE_HELP=n
   endif

-- 
LibreOffice packaging repository


Reply to: