[libreoffice] 02/18: evade /usr/share/java/java_defaults.mk for now

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

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 160e4cc7311f10c156c127be7cc2a174dd0a42fa
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Aug 19 13:42:14 2013 +0200

    evade /usr/share/java/java_defaults.mk for now
---
 rules |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules b/rules
index b8637ef..1344eea 100755
--- a/rules
+++ b/rules
@@ -154,7 +154,9 @@ ENABLE_JAVA=y
 ifeq "$(ENABLE_JAVA)" "y"
   ifneq "$(WHEEZY_BACKPORT)" "y"
     JDK=default
+    ifneq "$(DEB_VENDOR)" "Ubuntu" # we dont have this yet
     include /usr/share/java/java_defaults.mk
+    endif
   else
     JDK=openjdk
   endif

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