Author: drazzib Date: 2011-09-28 15:58:13 +0000 (Wed, 28 Sep 2011) New Revision: 15087
Modified: trunk/jajuk/debian/changelog trunk/jajuk/debian/control trunk/jajuk/debian/jajuk.sh trunk/jajuk/debian/rules Log: * Fix "FTBFS: JAVA_HOME not defined correctly.", in debian/rules: Check for multi-arch openjdk (Closes: #643512). * d/control: Build-Depends on openjdk-6-jdk but Depends on openjdk-6-jre | java6-jre | java7-jre * d/jajuk.sh: Allow searching for java7. Modified: trunk/jajuk/debian/changelog =================================================================== --- trunk/jajuk/debian/changelog 2011-09-27 23:18:06 UTC (rev 15086) +++ trunk/jajuk/debian/changelog 2011-09-28 15:58:13 UTC (rev 15087) @@ -1,3 +1,13 @@ +jajuk (1:1.9.5-3) unstable; urgency=low + + * Fix "FTBFS: JAVA_HOME not defined correctly.", in debian/rules: + Check for multi-arch openjdk (Closes: #643512). + * d/control: Build-Depends on openjdk-6-jdk but + Depends on openjdk-6-jre | java6-jre | java7-jre + * d/jajuk.sh: Allow searching for java7. + + -- Damien Raude-Morvan <[email protected]> Wed, 28 Sep 2011 17:43:21 +0200 + jajuk (1:1.9.5-2) unstable; urgency=low * d/patches/02_lastfm_fix_0_1_0.diff: Fix build with latest lastfm Modified: trunk/jajuk/debian/control =================================================================== --- trunk/jajuk/debian/control 2011-09-27 23:18:06 UTC (rev 15086) +++ trunk/jajuk/debian/control 2011-09-28 15:58:13 UTC (rev 15087) @@ -7,7 +7,6 @@ Damien Raude-Morvan <[email protected]> Build-Depends: cdbs, debhelper (>= 7) Build-Depends-Indep: ant, - default-jdk, entagged, libbasicplayer-java, libcobra-java, @@ -39,6 +38,7 @@ libvorbisspi-java, libxstream-java, mplayer, + openjdk-6-jdk, substance (>= 5.2) Standards-Version: 3.9.2 Homepage: http://jajuk.info/ @@ -82,7 +82,7 @@ libvorbisspi-java, libxstream-java, mplayer, - openjdk-6-jre, + openjdk-6-jre | java6-runtime | java7-runtime, substance (>= 5.2), ${misc:Depends} Description: advanced jukebox and music organizer Modified: trunk/jajuk/debian/jajuk.sh =================================================================== --- trunk/jajuk/debian/jajuk.sh 2011-09-27 23:18:06 UTC (rev 15086) +++ trunk/jajuk/debian/jajuk.sh 2011-09-28 15:58:13 UTC (rev 15087) @@ -8,13 +8,13 @@ mv "$HOME/.jajuk_test_1.7" "$HOME/.jajuk" fi -JAVA_OPTS="-Djava.library.path=/usr/lib/jni/ -client -Xms20M -Xmx512M -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10" +JAVA_OPTS="-client -Xms20M -Xmx512M -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10" JAJUK_OPTS="" # Include the wrappers utility script . /usr/lib/java-wrappers/java-wrappers.sh # We need a java6 runtime -find_java_runtime java6 +find_java_runtime java6 java7 exec $JAVA_HOME/bin/java $JAVA_OPTS -jar /usr/share/java/jajuk.jar $JAJUK_OPTS "$@" Modified: trunk/jajuk/debian/rules =================================================================== --- trunk/jajuk/debian/rules 2011-09-27 23:18:06 UTC (rev 15086) +++ trunk/jajuk/debian/rules 2011-09-28 15:58:13 UTC (rev 15087) @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -JAVA_HOME := /usr/lib/jvm/java-6-openjdk +JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk)) DEB_ANT_BUILDFILE := src/scripts/build.xml DEB_ANT_BUILD_TARGET := package_jar DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-httpclient commons-logging entagged-tageditor jaudiotagger jcommon jfreechart jl jmactritonusspi jogg jorbis jspeex log4j-1.2 mp3spi substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout jhlabs-filters lastfm commons-lang commons-io xstream simple-validation _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
