[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4-1-339-gbcbcb4c
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit a0cf405ad3f359d68cede99c71c5a850bc6e20c6
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Dec 11 11:25:59 2012 +0100
fixup mergelibs to debian changes
diff --git a/rules b/rules
index ae6d82f..bee3e09 100755
--- a/rules
+++ b/rules
@@ -529,7 +529,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
PARALLEL_BUILD=y
#temp. hacks
ENABLE_EVO2:=n
- ENABLE_MERGEDLIBS=y
+ ENABLE_MERGELIBS=y
SYSTEM_STUFF := $(filter-out liblangtag, $(SYSTEM_STUFF)) # using internal liblangtag for now -- debian reported armel troubles
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
@@ -1242,10 +1242,6 @@ ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
CONFIGURE_FLAGS += --disable-ccache
endif
-ifneq ($(ENABLE_LIBMERGED),y)
-CONFIGURE_FLAGS += --enable-mergelibs
-endif
-
## Build n projects in parallel?
## DEB_BUILD_OPTIONS=parallel=<n>
## if not specified LibreOffices configure tries to find it out itself
--
LibreOffice packaging repository
Reply to: