Index: /trunk/linux/latest/DEBIAN/control
===================================================================
--- /trunk/linux/latest/DEBIAN/control	(revision 8316)
+++ /trunk/linux/latest/DEBIAN/control	(revision 8317)
@@ -6,5 +6,5 @@
 Priority: extra
 Architecture: all
-Depends: openjdk-7-jre
+Depends: openjdk-7-jre | openjdk-8-jre
 Description: Editor for OpenStreetMap (daily development snapshot)
  JOSM is an editor for OpenStreetMap (OSM) written in Java.
Index: /trunk/linux/latest/usr/bin/josm-latest
===================================================================
--- /trunk/linux/latest/usr/bin/josm-latest	(revision 8316)
+++ /trunk/linux/latest/usr/bin/josm-latest	(revision 8317)
@@ -12,7 +12,7 @@
 # If OpenJDK is only available headless, do not try it
 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
-	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
 else
-	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/lib/jvm/java-8-oracle/bin/java /usr/bin/java"
+	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-8-oracle/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
 fi
 
Index: /trunk/linux/latest/usr/share/doc/josm-latest/copyright
===================================================================
--- /trunk/linux/latest/usr/share/doc/josm-latest/copyright	(revision 8316)
+++ /trunk/linux/latest/usr/share/doc/josm-latest/copyright	(revision 8317)
@@ -1,3 +1,3 @@
-Copyright (c) 2005-2014 JOSM developers <josm-dev@openstreetmap.org>
+Copyright (c) 2005-2015 JOSM developers <josm-dev@openstreetmap.org>
 
 License: GPL3+
Index: /trunk/linux/tested/DEBIAN/control
===================================================================
--- /trunk/linux/tested/DEBIAN/control	(revision 8316)
+++ /trunk/linux/tested/DEBIAN/control	(revision 8317)
@@ -6,5 +6,5 @@
 Priority: extra
 Architecture: all
-Depends: openjdk-7-jre
+Depends: openjdk-7-jre | openjdk-8-jre
 Conflicts: josm-plugins
 Replaces: josm-plugins
Index: /trunk/linux/tested/usr/bin/josm
===================================================================
--- /trunk/linux/tested/usr/bin/josm	(revision 8316)
+++ /trunk/linux/tested/usr/bin/josm	(revision 8317)
@@ -12,7 +12,7 @@
 # If OpenJDK is only available headless, do not try it
 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
-	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
 else
-	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/lib/jvm/java-8-oracle/bin/java /usr/bin/java"
+	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-8-oracle/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
 fi
 
Index: /trunk/linux/tested/usr/share/doc/josm/copyright
===================================================================
--- /trunk/linux/tested/usr/share/doc/josm/copyright	(revision 8316)
+++ /trunk/linux/tested/usr/share/doc/josm/copyright	(revision 8317)
@@ -1,3 +1,3 @@
-Copyright (c) 2005-2014 JOSM developers <josm-dev@openstreetmap.org>
+Copyright (c) 2005-2015 JOSM developers <josm-dev@openstreetmap.org>
 
 License: GPL3+