Adds OpenJDK 7 for debian packages

ringo · Dec 22, 2014 · 43c6167 · 43c6167
1 parent 03a8df2
commit 43c6167
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/debian/control b/debian/control
@@ -2,15 +2,15 @@ Source: ringojs
 Section: web
 Priority: optional
 Maintainer: Hannes Wallnoefer <hannes@helma.at>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk | java5-sdk | java6-sdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk | java5-sdk | java6-sdk | openjdk-7-jdk
 Build-Depends-Indep: ant
 Standards-Version: 3.8.0
 Homepage: http://ringojs.org/
 
 Package: ringojs
 Architecture: all
 Depends: default-jre-headless | system-java (>= 1.5) |
-  java5-runtime-headless | java6-runtime-headless,
+  java5-runtime-headless | java6-runtime-headless | openjdk-7-jre-headless,
   jsvc, adduser, lsb-base (>= 3)
 Description: JavaScript runtime and shell written in Java.
  .

diff --git a/debian/rules b/debian/rules
@@ -14,6 +14,8 @@ JAVA_HOME_DIRS       := /usr/lib/jvm/default-java \
                         /usr/lib/jvm/java-5-sun \
                         /usr/lib/jvm/java-6-openjdk \
                         /usr/lib/jvm/java-6-sun \
+                        /usr/lib/jvm/java-7-openjdk \
+                        /usr/lib/jvm/java-7-openjdk-amd64 \
                         /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET := jar