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

[libreoffice] 15/18: remove some more Python2 UNO



This is an automated email from the git hooks/post-receive script.

sweetshark-guest pushed a commit to branch ubuntu-saucy-4.1
in repository libreoffice.

commit 73906e432f57b48dffc2d9189936048f62a8b99f
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Aug 26 11:01:33 2013 +0200

    remove some more Python2 UNO
---
 rules |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules b/rules
index 9518774..0b584bd 100755
--- a/rules
+++ b/rules
@@ -1208,7 +1208,7 @@ else
 endif
 
 ifneq "$(ENABLE_PYTHON)" "y"
-	DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno -Nlibreoffice-script-provider-python
+	DEBHELPER_OPTIONS+= -Npython3-uno -Nlibreoffice-script-provider-python
   ifeq "$(BUILD_ISOS)" "en-US"
 	CONFIGURE_FLAGS += --disable-python
   else
@@ -1219,7 +1219,7 @@ else
 	DEBHELPER_OPTIONS+= -Npython3-uno
 	PYUNO_DEPENDS = python-uno
   else
-	PYUNO_DEPENDS = python3-uno (>= 4.0~) | python-uno
+	PYUNO_DEPENDS = python3-uno (>= 4.0~)
   endif
   CONFIGURE_FLAGS += --enable-python=system
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: