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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. f6e0f0ece62eac484adaed388fce8b1a7f73e8d0



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit defb648341e75aba47b1f406f1990fbcd61bc404
Author: Rene Engelhard <rene@debian.org>
Date:   Fri May 27 22:56:55 2011 +0200

    there's also a new --disable-python

diff --git a/rules b/rules
index 0840546..8b0c2d9 100755
--- a/rules
+++ b/rules
@@ -574,7 +574,6 @@ ifeq "$(BUILD_PYUNO)" "y"
   endif
 	DBG_DBG_SUGGESTS+= , python-dbg
 	BUILD_DEPS += , $(PYTHON)-dev
-        CONFIGURE_FLAGS += --enable-ext-scripting-python
 else
 	BUILD_DEPS += , python
 endif
@@ -968,6 +967,9 @@ endif
 
 ifneq "$(BUILD_PYUNO)" "y"
 	DEBHELPER_OPTIONS+= -Npython-uno
+	CONFIGURE_FLAGS += --disable-python
+else
+        CONFIGURE_FLAGS += --enable-ext-scripting-python
 endif
 
 ifeq "$(ENABLE_JAVA)" "y"

-- 
LibreOffice packaging repository


Reply to: