Author: nomadium-guest Date: 2011-09-07 23:51:25 +0000 (Wed, 07 Sep 2011) New Revision: 14759
Modified: trunk/freemind/debian/changelog trunk/freemind/debian/control trunk/freemind/debian/rules Log: Switch to default-jdk Modified: trunk/freemind/debian/changelog =================================================================== --- trunk/freemind/debian/changelog 2011-09-07 23:49:01 UTC (rev 14758) +++ trunk/freemind/debian/changelog 2011-09-07 23:51:25 UTC (rev 14759) @@ -5,8 +5,9 @@ * Bump Standards-Version to 3.9.2. No changes were required. * Drop unneeded Build-Depends on quilt. * Add Vcs-* fields. + * Switch to default-jdk. (Closes: #640859). - -- Miguel Landaeta <[email protected]> Sat, 03 Sep 2011 12:57:04 -0430 + -- Miguel Landaeta <[email protected]> Wed, 07 Sep 2011 19:59:41 -0430 freemind (0.9.0+dfsg-1) unstable; urgency=low Modified: trunk/freemind/debian/control =================================================================== --- trunk/freemind/debian/control 2011-09-07 23:49:01 UTC (rev 14758) +++ trunk/freemind/debian/control 2011-09-07 23:51:25 UTC (rev 14759) @@ -6,7 +6,7 @@ # FreeMind can be built with JiBX 1.0, 1.1 and 1.2, but the result does only # run with the version it was built with. JiBX 1.1 has been chosen for # compatibility with Ubuntu. -Build-Depends-Indep: docbook-to-man, ant, ant-optional, openjdk-6-jdk, imagemagick, libbatik-java (>= 1.6), rhino, libjgoodies-forms-java, groovy, libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), javahelp2, fop +Build-Depends-Indep: docbook-to-man, ant, ant-optional, default-jdk, imagemagick, libbatik-java (>= 1.6), rhino, libjgoodies-forms-java, groovy, libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), javahelp2, fop Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.8) Homepage: http://freemind.sourceforge.net/ Standards-Version: 3.9.2.0 @@ -15,7 +15,7 @@ Package: freemind Architecture: all -Depends: openjdk-6-jre | sun-java6-jre, libjgoodies-forms-java, libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), ${misc:Depends} +Depends: default-jre | sun-java6-jre, libjgoodies-forms-java, libjibx1.1-java | libjibx-java (>= 1.1), libjibx1.1-java | libjibx-java (<< 1.2), simplyhtml (>> 0.13), ${misc:Depends} Recommends: freemind-doc, xdg-utils, java-wrappers Suggests: freemind-plugins-help, freemind-plugins-svg, freemind-plugins-script, freemind-browser Conflicts: freemind-plugins-time (<< ${binary:Version}) Modified: trunk/freemind/debian/rules =================================================================== --- trunk/freemind/debian/rules 2011-09-07 23:49:01 UTC (rev 14758) +++ trunk/freemind/debian/rules 2011-09-07 23:51:25 UTC (rev 14759) @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk +JAVA_HOME_DIRS := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant DEB_JARS := ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-commons-logging ant-javamail ant-jdepend ant-nodeps ant-swing ant-jmf ant-apache-resolver ant-commons-net ant-jsch ant-junit ant-trax _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
