Author: ludovicc-guest Date: 2009-07-14 13:24:46 +0000 (Tue, 14 Jul 2009) New Revision: 9295
Removed: trunk/velocity/debian/patches/pom.patch Modified: trunk/velocity/debian/changelog trunk/velocity/debian/control trunk/velocity/debian/patches/series trunk/velocity/debian/rules Log: Use openjdk-6-jdk instead of kaffe for the build Modified: trunk/velocity/debian/changelog =================================================================== --- trunk/velocity/debian/changelog 2009-07-14 12:56:40 UTC (rev 9294) +++ trunk/velocity/debian/changelog 2009-07-14 13:24:46 UTC (rev 9295) @@ -5,7 +5,7 @@ * Bump up debhelper to 6 * Move debhelper and cdbs from Build-Depends-Indep to Build-Depends to clear Lintian error - * Use default-jdk instead of kaffe for the build + * Use openjdk-6-jdk instead of kaffe for the build * Use default-jre-headless | java1-runtime-headless | java2-runtime-headless instead of kaffe | java1-runtime | java2-runtime for velocity Depends: * Update from libjdom0-java to libjdom1-java (Closes: #500536) Modified: trunk/velocity/debian/control =================================================================== --- trunk/velocity/debian/control 2009-07-14 12:56:40 UTC (rev 9294) +++ trunk/velocity/debian/control 2009-07-14 13:24:46 UTC (rev 9295) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org> Uploaders: Arnaud Vandyck <av...@debian.org>, Wolfgang Baer <wb...@gmx.de>, Ludovic Claude <ludovic.cla...@laposte.net> -Build-Depends: debhelper (>= 6), cdbs, default-jdk, quilt +Build-Depends: debhelper (>= 6), cdbs, openjdk-6-jdk, quilt Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 5), ant, ant-optional, junit, liblogkit-java, libservlet2.5-java, liblog4j1.2-java, libjdom1-java, libcommons-lang-java, libcommons-collections3-java, libcommons-logging-java, Deleted: trunk/velocity/debian/patches/pom.patch =================================================================== --- trunk/velocity/debian/patches/pom.patch 2009-07-14 12:56:40 UTC (rev 9294) +++ trunk/velocity/debian/patches/pom.patch 2009-07-14 13:24:46 UTC (rev 9295) @@ -1,11 +0,0 @@ ---- a/pom.xml -+++ b/pom.xml -@@ -262,7 +260,7 @@ - <!-- Apache JIRA, Component Engine --> - <component>12311337</component> - <!-- FixFor 1.6 --> -- <filter>fixfor=12310290&sorter/field=issuekey&sorter/order=ASC</filter> -+<!-- removed as this line causes FTBFS on some platforms. Uncessary for us anyway.--> - <maxEntries>100</maxEntries> - <teamlist>http://velocity.apache.org/who-we-are.html</teamlist> - </configuration> Modified: trunk/velocity/debian/patches/series =================================================================== --- trunk/velocity/debian/patches/series 2009-07-14 12:56:40 UTC (rev 9294) +++ trunk/velocity/debian/patches/series 2009-07-14 13:24:46 UTC (rev 9295) @@ -1,2 +1 @@ -pom.patch build.patch Modified: trunk/velocity/debian/rules =================================================================== --- trunk/velocity/debian/rules 2009-07-14 12:56:40 UTC (rev 9294) +++ trunk/velocity/debian/rules 2009-07-14 13:24:46 UTC (rev 9295) @@ -7,7 +7,7 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java +JAVA_HOME := /usr/lib/jvm/java-6-openjdk DEB_JARS := ant-nodeps junit logkit servlet-api-2.5 log4j-1.2 commons-lang commons-collections3 commons-logging werken.xpath bcel oro jdom1 antlr DEB_ANT_BUILD_TARGET := package javadoc DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits