diff -u freecol-0.7.2/debian/wrapper/freecol freecol-0.7.2/debian/wrapper/freecol --- freecol-0.7.2/debian/wrapper/freecol +++ freecol-0.7.2/debian/wrapper/freecol @@ -8,10 +8,8 @@ then if [ -d /usr/lib/jvm/java-7-icedtea/jre ]; then JAVA_HOME=/usr/lib/jvm/java-7-icedtea - JAVA=java else # We use java6 from Sun JAVA_HOME=/usr/lib/jvm/java-6-sun - JAVA=${JAVA_HOME}/jre/bin/java fi fi @@ -23,4 +21,8 @@ +if [ -x $JAVA_HOME/jre/bin/java ]; then + JAVA=$JAVA_HOME/jre/bin/java +fi + export JAVA=${JAVA:=java} -exec $JAVA -Xmx128M -jar /usr/share/java/freecol.jar --freecol-data \ +exec $JAVA -Xmx192M -jar /usr/share/java/freecol.jar --freecol-data \ /usr/share/games/freecol $lang_argument "$@" diff -u freecol-0.7.2/debian/control freecol-0.7.2/debian/control --- freecol-0.7.2/debian/control +++ freecol-0.7.2/debian/control @@ -1,7 +1,8 @@ Source: freecol Section: contrib/games Priority: optional -Maintainer: Debian Games Team +XSBC-Original-Maintainer: Debian Games Team +Maintainer: Ubuntu MOTU Developers Uploaders: Vincent Fourmond Build-Depends: debhelper (>= 5), dpatch, ant, icedtea-java7-jdk | sun-java6-jdk diff -u freecol-0.7.2/debian/changelog freecol-0.7.2/debian/changelog --- freecol-0.7.2/debian/changelog +++ freecol-0.7.2/debian/changelog @@ -1,3 +1,12 @@ +freecol (0.7.2-5ubuntu1) hardy; urgency=low + + * debian/wrapper/freecol: improved detection of java executable + if JAVA_HOME is set + * increased memory to 192M, since freecol does not start with + 128M any more + + -- Stefan Fleiter Mon, 25 Feb 2008 21:32:57 +0100 + freecol (0.7.2-5) unstable; urgency=low * Bumped standards-version to 3.7.3 (no changes required)