[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-61-g336fefd
The following commit has been merged in the debian-experimental-3.5 branch:
commit 336fefd86d0305a1147875224f6fd5ccaae4173f
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 28 13:24:54 2011 +0200
use --disable-linkoo uncoditionally and remove obsolete translate-toolkit b-d/configure flag
diff --git a/rules b/rules
index 12cd0be..d6f0eb5 100755
--- a/rules
+++ b/rules
@@ -294,7 +294,8 @@ CONFIGURE_FLAGS= \
--enable-extension-integration \
--disable-online-update \
--disable-fetch-external \
- --enable-release-build
+ --enable-release-build \
+ --disable-linkoo
ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
@@ -644,7 +645,6 @@ endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , epm
- CONFIGURE_FLAGS += --disable-linkoo
endif
ifeq "$(RUN_TESTTOOL)" "y"
CONFIGURE_FLAGS += --enable-hids
@@ -1164,11 +1164,6 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
BUILD_DEPS_INDEP += , fontforge
endif
-ifneq "$(ISOS)" "en-US"
- CONFIGURE_FLAGS += --with-system-translate-toolkit
- BUILD_DEPS_INDEP += , translate-toolkit (>= 1.9)
-endif
-
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster rebuild times
# A complete build uses about 200Mb of compiler cache.
ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
--
LibreOffice packaging repository
Reply to: