[libreoffice] 01/02: actually add -Npython-uno if ENABLE_PYTHON2=n
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 27c4b176df7eb9490468a103607bed5c5ca5f0ef
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 14 16:38:02 2014 +0200
actually add -Npython-uno if ENABLE_PYTHON2=n
---
changelog | 1 +
rules | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/changelog b/changelog
index 203a625..7b4c5d6 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,7 @@ libreoffice (1:4.2.5~rc2-1) UNRELEASED; urgency=medium
- use internal np_sdk because the "NPAPI plugins inside LO" part doesn't
build (uses a internal/external header mix even with
--with-system-npapi-headers) with iceweasel 30.0...
+ - actually add -Npython-uno if ENABLE_PYTHON2=n
-- Rene Engelhard <rene@debian.org> Sat, 14 Jun 2014 10:23:03 +0200
diff --git a/rules b/rules
index e0e0bd4..ba84313 100755
--- a/rules
+++ b/rules
@@ -1272,7 +1272,12 @@ else
DEBHELPER_OPTIONS+= -Npython3-uno
PYUNO_DEPENDS = python-uno
else
+ ifeq "$(ENABLE_PYTHON2)" "y"
PYUNO_DEPENDS = python3-uno (>= 4.0~) | python-uno
+ else
+ PYUNO_DEPENDS = python3-uno (>= 4.0~)
+ DEBHELPER_OPTIONS+= -Npython-uno
+ endif
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: