Author: ludovicc-guest Date: 2009-07-13 20:27:54 +0000 (Mon, 13 Jul 2009) New Revision: 9233
Modified: trunk/libcommons-validator-java/debian/ant.properties trunk/libcommons-validator-java/debian/changelog trunk/libcommons-validator-java/debian/control trunk/libcommons-validator-java/debian/patches/build.patch trunk/libcommons-validator-java/debian/rules Log: * Use open-jdk6 for the build Modified: trunk/libcommons-validator-java/debian/ant.properties =================================================================== --- trunk/libcommons-validator-java/debian/ant.properties 2009-07-13 20:25:17 UTC (rev 9232) +++ trunk/libcommons-validator-java/debian/ant.properties 2009-07-13 20:27:54 UTC (rev 9233) @@ -7,3 +7,4 @@ oro.jar=/usr/share/java/oro.jar junit.jar=/usr/share/java/junit.jar xerces.jar=/usr/share/java/xercesImpl.jar +skip.download=true Modified: trunk/libcommons-validator-java/debian/changelog =================================================================== --- trunk/libcommons-validator-java/debian/changelog 2009-07-13 20:25:17 UTC (rev 9232) +++ trunk/libcommons-validator-java/debian/changelog 2009-07-13 20:27:54 UTC (rev 9233) @@ -10,6 +10,9 @@ * Move liboro-java to Recommends as this library is optional * Use default-jdk for the build instead of java-gcj-compat-dev * Put the Javadoc into a separate doc package + * Use openjdk-6-jdk for the build instead of default-java as + default-java can use gcj which has issues when generating + the Javadoc. -- Ludovic Claude <[email protected]> Thu, 02 jul 2009 14:12:30 +0100 Modified: trunk/libcommons-validator-java/debian/control =================================================================== --- trunk/libcommons-validator-java/debian/control 2009-07-13 20:25:17 UTC (rev 9232) +++ trunk/libcommons-validator-java/debian/control 2009-07-13 20:27:54 UTC (rev 9233) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Arnaud Vandyck <[email protected]>, Kumar Appaiah <[email protected]>, Varun Hiremath <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, quilt +Build-Depends: debhelper (>= 7), cdbs, openjdk-6-jdk, quilt Build-Depends-Indep: maven-repo-helper, ant, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.7), libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.6), libcommons-logging-java (>= 1.0.6), liboro-java (>= 2.0.8), sgml-base, rhino Modified: trunk/libcommons-validator-java/debian/patches/build.patch =================================================================== --- trunk/libcommons-validator-java/debian/patches/build.patch 2009-07-13 20:25:17 UTC (rev 9232) +++ trunk/libcommons-validator-java/debian/patches/build.patch 2009-07-13 20:27:54 UTC (rev 9233) @@ -1,6 +1,31 @@ --- a/build.xml +++ b/build.xml -@@ -262,7 +262,7 @@ +@@ -133,16 +133,6 @@ + <pathelement location="${commons-digester.jar}"/> + <pathelement location="${commons-logging.jar}"/> + <pathelement location="${oro.jar}"/> +- <path refid="downloaded.lib.classpath"/> +- </path> +- +- <!-- Construct compile classpath --> +- <path id="downloaded.lib.classpath"> +- <pathelement location="${download.lib.dir}/commons-beanutils.jar"/> +- <pathelement location="${download.lib.dir}/commons-digester.jar"/> +- <pathelement location="${download.lib.dir}/commons-logging.jar"/> +- <pathelement location="${download.lib.dir}/oro.jar"/> +- <pathelement location="${download.lib.dir}/junit.jar"/> + </path> + + <!-- ========== Test Execution Defaults =================================== --> +@@ -158,7 +148,6 @@ + <pathelement location="${oro.jar}"/> + <pathelement location="${junit.jar}"/> + <pathelement location="${xerces.jar}"/> +- <path refid="downloaded.lib.classpath"/> + </path> + + <!-- Should all tests fail if one does? --> +@@ -262,7 +251,7 @@ description="Initializes Javadoc directories"> <mkdir dir="${dist.home}"/> <mkdir dir="${dist.home}/docs"/> @@ -9,7 +34,7 @@ <mkdir dir="${dist.home}/docs/javascript"/> <mkdir dir="${dist.home}/docs/javascript/org/apache/commons/validator/javascript/doc-files"/> </target> -@@ -293,7 +293,7 @@ +@@ -293,7 +282,7 @@ <target name="javadoc" depends="compile, javadoc.js" description="Create component Javadoc documentation"> <javadoc sourcepath="${source.home}" Modified: trunk/libcommons-validator-java/debian/rules =================================================================== --- trunk/libcommons-validator-java/debian/rules 2009-07-13 20:25:17 UTC (rev 9232) +++ trunk/libcommons-validator-java/debian/rules 2009-07-13 20:27:54 UTC (rev 9233) @@ -10,7 +10,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 := junit commons-beanutils commons-collections commons-digester commons-logging oro DEB_ANT_BUILD_TARGET := dist _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
