diff options
author | Ingo Bauersachs <ingo@jitsi.org> | 2017-01-04 23:13:56 +0100 |
---|---|---|
committer | Ingo Bauersachs <ingo@jitsi.org> | 2017-01-04 23:13:56 +0100 |
commit | 169ace9e6b745530f17fc19b51fa19d30b809cdc (patch) | |
tree | 962a98ced9cac7e0034b6ddbdeb2931dc2837966 | |
parent | 01bccdea45cdf07d5bbbc9c4e9f4073e88aee024 (diff) | |
download | jitsi-169ace9e6b745530f17fc19b51fa19d30b809cdc.zip jitsi-169ace9e6b745530f17fc19b51fa19d30b809cdc.tar.gz jitsi-169ace9e6b745530f17fc19b51fa19d30b809cdc.tar.bz2 |
Depend on generic Java 7 (or later) SDK/runtime
Closes #265
-rw-r--r-- | resources/install/debian/control-src.tmpl | 4 | ||||
-rw-r--r-- | resources/install/debian/control.tmpl | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl index f7ad24f..fc677e2 100644 --- a/resources/install/debian/control-src.tmpl +++ b/resources/install/debian/control-src.tmpl @@ -6,7 +6,7 @@ Uploaders: Emil Ivov <emcho@jitsi.org>, Damian Minkov <damencho@jitsi.org> Homepage: _APP_WEB_ Build-Depends: debhelper (>= 9), javahelper, dpkg-dev (>= 1.16.1), - default-jdk, + default-jdk | java7-sdk, ant, ant-optional, ant-contrib-cpptasks, @@ -59,7 +59,7 @@ Depends: ${misc:Depends}, _PACKAGE_NAME_-common (= ${source:Version}), libjitsi (= ${libjitsi:version}), libjitsi-jni (= ${libjitsi:version}), - default-jre, + default-jre | java7-runtime, libunixsocket-java, libhttpcore-java, liblog4j1.2-java, diff --git a/resources/install/debian/control.tmpl b/resources/install/debian/control.tmpl index 79b363b..50f56a8 100644 --- a/resources/install/debian/control.tmpl +++ b/resources/install/debian/control.tmpl @@ -6,7 +6,7 @@ Uploaders: Emil Ivov <emcho@jitsi.org> Homepage: _APP_WEB_ Build-Depends: debhelper (>= 9), javahelper, dpkg-dev (>= 1.16.1), - default-jdk, + default-jdk | java7-sdk, ant, ant-optional, ant-contrib-cpptasks, @@ -58,7 +58,9 @@ Standards-Version: 3.9.5 Package: _PACKAGE_NAME_ Architecture: i386 amd64 -Depends: default-jre, libxss1, jitsi-archive-keyring +Depends: default-jre | java7-runtime, + libxss1, + jitsi-archive-keyring Description: VoIP and Instant Messaging client _APP_NAME_ is an application that allows you to do audio/video conversations over the Internet through the SIP and XMPP/Jabber protocol, |