[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-1-26-gd376146
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 6003b2b1bb300dd50b2fe9a274fbdbe9f8abd2a9
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Jul 18 10:32:42 2011 +0200
add configureflags directy, instead of depending on the distro-config insanity
diff --git a/rules b/rules
index 3b74c60..5b04fd2 100755
--- a/rules
+++ b/rules
@@ -942,6 +942,7 @@ ifeq "$(BUILD_KDE)" "n"
CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
else
CONFIGURE_FLAGS += --disable-kde
+ CONFIGURE_FLAGS += --enable-kde4
KDE_ICONSET_DEP=libreoffice$(VER)-style-oxygen
BUILD_DEPS += , kdelibs5-dev $(KDELIBS_MINVER)
BUILD_DEPS += , libqt4-dev $(QT_MINVER)
@@ -973,6 +974,7 @@ endif
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
else
+ CONFIGURE_FLAGS += --enable-evolution2
BUILD_DEPS += , libebook1.2-dev$(OOO_NO_BASE_ARCHS)
endif
--
LibreOffice packaging repository
Reply to: