Changeset 7494 in josm for trunk


Ignore:
Timestamp:
2014-09-04T21:45:38+02:00 (10 years ago)
Author:
Don-vip
Message:

update proguard to version 5.0 + debian/ubuntu stuff

Location:
trunk
Files:
2 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r7489 r7494  
    541541            <ignore classname="org.python.*"/>
    542542            <ignore classname="org.slf4j.*"/>
     543                <!-- plugins used by another ones -->
     544            <ignore classname="org.openstreetmap.josm.plugins.geotools.*"/>
     545            <ignore classname="org.openstreetmap.josm.plugins.jts.*"/>
     546            <ignore classname="org.openstreetmap.josm.plugins.log4j.*"/>
     547            <ignore classname="org.openstreetmap.josm.plugins.utilsplugin2.*"/>
    543548            <path path="${dir}"/>
    544549        </as:check-signature>

  • trunk/data_nodist

    • Property svn:ignore set to
      Thumbs.db

  • trunk/linux/latest/usr/bin/josm-latest

    r7481 r7494  
    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"
     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"
    1515else
    16         JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
     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"
    1717fi
    1818

  • trunk/linux/latest/usr/share/doc/josm-latest/copyright

    r7481 r7494  
    1 Copyright (c) 2005-2011 Immanuel Scholz <imi@eigenheimstrasse.de> and others
     1Copyright (c) 2005-2014 JOSM developers <josm-dev@openstreetmap.org>
    22
    33License: GPL3+

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

    r7481 r7494  
    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"
     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"
    1515else
    16         JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
     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"
    1717fi
    1818

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

    r7481 r7494  
    1 Copyright (c) 2005-2011 Immanuel Scholz <imi@eigenheimstrasse.de> and others
     1Copyright (c) 2005-2014 JOSM developers <josm-dev@openstreetmap.org>
    22
    33License: GPL3+
Note: See TracChangeset for help on using the changeset viewer.