From 74f4859e13c74305ea51ab71459217d648bff173 Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 18 Nov 2012 18:52:13 +0000 Subject: [PATCH] explicitly prefer openjdk-*-headless over default-jre-headless. On Debian Squeeze the default-jre-* packages point to gij/gcj which is suboptimal. Openjdk cannot be forced since not all platforms--such as kFreeBSD--have it as an available option. --- debian/control | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 1e7e30c53..42cb7596a 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,7 @@ Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, adduser, i2p-router (>= 0.8.6-5), - libjbigi-jni (>= ${source:Version}), - libjbigi-jni (<< ${source:Version}.1~), + libjbigi-jni, lsb-base, service-wrapper Description: Load-balanced unspoofable packet switching network @@ -65,7 +64,7 @@ Architecture: all Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - default-jre-headless | java5-runtime-headless | java6-runtime-headless, libecj-java + openjdk-6-jre-headless | openjdk-7-jre-headless | default-jre-headless | java5-runtime-headless | java6-runtime-headless, libecj-java Replaces: i2p ( << 0.8.6-5) Breaks: i2p (<< 0.8.6-5) Recommends: libjbigi-jni (>= ${source:Version}), libjbigi-jni (<< ${source:Version}.1~), ttf-dejavu