The following commit has been merged in the debian-experimental-3.5 branch:
commit 2c3af34742fb95ad11a70c8ce254807082079d83
Author: Rene Engelhard <[email protected]>
Date: Sun Feb 19 23:15:31 2012 +0100
more configure cleanup baed on Rico Tzschichholzs hints
diff --git a/changelog b/changelog
index 201fca2..3937352 100644
--- a/changelog
+++ b/changelog
@@ -13,7 +13,7 @@ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
- remove obsolete (and buggy) conditional icu-on-arm-fails breaking
the build
- apply patch from Rico Tzschichholz to update some configure flags
- to new names in 3.5.x
+ to new names in 3.5.x; remove some obsolete ones
[ Bjoern Michaelsen ]
* debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
diff --git a/rules b/rules
index d9bbe46..4229ae5 100755
--- a/rules
+++ b/rules
@@ -248,7 +248,6 @@ ENABLE_GVFS=n
ENABLE_GCONF=y
ENABLE_GIO=y
ENABLE_RANDR=y
-ENABLE_LAYOUT=n
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NPSOPLUGIN=y
endif
@@ -295,12 +294,11 @@ CONFIGURE_FLAGS= \
--with-vendor='$(OOO_VENDOR)' \
--with-install-dirname=$(OODIRNAME) \
--prefix=/usr --mandir=/usr/share/man \
- --with-docdir=/usr/share/doc/libreoffice \
- --disable-strip \
+ --docdir=/usr/share/doc/libreoffice \
+ --disable-strip-solver \
--enable-lockdown \
--libdir=/usr/lib \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --enable-broffice \
--enable-extension-integration \
--disable-online-update \
--disable-fetch-external \
@@ -313,10 +311,6 @@ ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
endif
-# distro-configs is too late; it already gets searched in unpack
-# when we don't do that here, too.
-CONFIGURE_FLAGS += --disable-access
-
CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
#############
@@ -707,12 +701,6 @@ ifneq "$(BUILD_ONLY_EN_US)" "y"
endif
endif
-ifeq "$(VER)" ""
- CONFIGURE_FLAGS += --with-binsuffix=no
-else
- CONFIGURE_FLAGS += --with-binsuffix=$(VER)
-endif
-
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
@@ -1036,10 +1024,6 @@ else
CONFIGURE_FLAGS += --disable-randr
endif
-ifneq "$(ENABLE_LAYOUT)" "y"
- CONFIGURE_FLAGS += --disable-layout
-endif
-
ifeq "$(BUILD_BINFILTERS)" "y"
CONFIGURE_FLAGS+= --enable-binfilter
OOO_BINFILTER_DEP = libreoffice$(VER)-filter-binfilter
@@ -1048,10 +1032,6 @@ endif
ifneq "$(BUILD_PYUNO)" "y"
DEBHELPER_OPTIONS+= -Npython-uno
CONFIGURE_FLAGS += --disable-python
-else
- ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
- CONFIGURE_FLAGS += --enable-ext-scripting-python
- endif
endif
ifeq "$(ENABLE_JAVA)" "y"
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
