Changeset 8317 in josm for trunk/linux/tested


Ignore:
Timestamp:
2015-05-03T16:58:21+02:00 (9 years ago)
Author:
Don-vip
Message:

see #11390 - accept openjdk-8-jre in Debian control file, prefer Java 8 runtime over Java 7 in launch script

Location:
trunk/linux/tested
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/linux/tested/DEBIAN/control

    r7481 r8317  
    66Priority: extra
    77Architecture: all
    8 Depends: openjdk-7-jre
     8Depends: openjdk-7-jre | openjdk-8-jre
    99Conflicts: josm-plugins
    1010Replaces: josm-plugins

  • trunk/linux/tested/usr/bin/josm

    r7506 r8317  
    1212# If OpenJDK is only available headless, do not try it
    1313if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
    14         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"
     14        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"
    1515else
    16         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"
     16        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"
    1717fi
    1818

  • trunk/linux/tested/usr/share/doc/josm/copyright

    r7494 r8317  
    1 Copyright (c) 2005-2014 JOSM developers <josm-dev@openstreetmap.org>
     1Copyright (c) 2005-2015 JOSM developers <josm-dev@openstreetmap.org>
    22
    33License: GPL3+
Note: See TracChangeset for help on using the changeset viewer.