From 9e3ac0d16f7869aeb00e06c12865c8dc7d1b2d11 Mon Sep 17 00:00:00 2001 From: Sven Bunge Date: Sun, 1 Jun 2014 23:01:09 +0200 Subject: [PATCH] Upgrade build dependencies to openjdk7. --- build/debian/control | 4 ++-- build/debian/rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/debian/control b/build/debian/control index 53acff1ad2..5dfcca8ef0 100644 --- a/build/debian/control +++ b/build/debian/control @@ -2,14 +2,14 @@ Source: openfire Section: net Priority: optional Maintainer: Ignite Realtime Community -Build-Depends: debhelper (>= 5), cdbs, patchutils, sun-java6-jdk | oracle-j2sdk1.7 | openjdk-6-jdk | openjdk-7-jdk, ant +Build-Depends: debhelper (>= 5), cdbs, patchutils, openjdk-7-jdk | oracle-j2sdk1.7 , ant Standards-Version: 3.7.2 Homepage: http://www.igniterealtime.org Package: openfire Section: net Priority: optional -Pre-Depends: sun-java6-jre | default-jre-headless | openjdk-6-jre | openjdk-7-jre | oracle-java7-jre +Pre-Depends: openjdk-7-jre | oracle-java7-jre Architecture: all Description: A high performance XMPP (Jabber) server. Openfire is an instant messaging server that implements the XMPP diff --git a/build/debian/rules b/build/debian/rules index 5f4f744809..20eee8bc92 100644 --- a/build/debian/rules +++ b/build/debian/rules @@ -13,7 +13,7 @@ ETCDIR := $(DEST)/etc/openfire LOGDIR := $(DEST)/var/log/openfire VARDIR := $(DEST)/var/lib/openfire -JAVA_HOME ?= /usr/lib/jvm/java-6-sun +JAVA_HOME ?= /usr/lib/jvm/java-7-openjdk-amd64 DEB_ANT_BUILDFILE := build/build.xml DEB_ANT_CLEAN_TARGET := clean