o Using jdk7 by default.

jschneider · May 18, 2013 · 3bb272f · 3bb272f
1 parent b9bddca
commit 3bb272f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/debian/control.in b/debian/control.in
@@ -3,8 +3,8 @@ Section: devel
 Version: VERSION
 Maintainer: Trygve Laugstøl <trygvis@inamo.no>
 Architecture: all
-Depends: sun-java6-jdk | openjdk-6-jdk
-Suggests: openjdk-6-source
+Depends: openjdk-7-jdk | sun-java6-jdk | openjdk-6-jdk
+Suggests: openjdk-6-source, openjdk-7-source
 Conflicts: intellij-idea-OTHER_FLAVOR_LOWER, intellij-idea-OTHER_FLAVOR, intellij-idea-FLAVOR
 Description: The Most Intelligent Java IDE
 
diff --git a/idea.in b/idea.in
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 paths="
+/usr/lib/jvm/java-7-openjdk
+/usr/lib/jvm/java-7-openjdk-amd64
+/usr/jdk/instances/jdk1.7.0
+
 /usr/jdk/instances/jdk1.6.0
 /usr/lib/jvm/java-6-sun
 /usr/lib/jvm/java-6-openjdk