[libreoffice] 14/20: stay with bsh for Ubuntu

[Bjoern Michaelsen <sweetshark-guest@moszumanska.debian.org>]

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

sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.

commit bd2248acdd04da7812e179548d2107987bd3007b
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Dec 20 00:09:56 2013 +0100

    stay with bsh for Ubuntu
---
 rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules b/rules
index 9a58652..1398cdf 100755
--- a/rules
+++ b/rules
@@ -1324,7 +1324,7 @@ ifeq "$(ENABLE_JAVA)" "y"
   endif
   ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
     ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
-      ifneq "$(WHEEZY_BACKPORT)" "y"
+      ifeq "$(DEB_VENDOR)$(WHEEZY_BACKPORT)" "Debian"
 	# -gcj is gone
 	BUILD_DEPS_INDEP += , libbsh-java
 	BSH_DEPENDS = libbsh-java

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