Author: nomadium-guest Date: 2011-10-18 00:24:37 +0000 (Tue, 18 Oct 2011) New Revision: 15210
Modified: branches/libspring-java/3.1/debian/control branches/libspring-java/3.1/debian/patches/0012_forkjoinpool.diff Log: * Add versioned dependency on libjsr166y-java (>= 1.7.0~). Modified: branches/libspring-java/3.1/debian/control =================================================================== --- branches/libspring-java/3.1/debian/control 2011-10-17 22:03:17 UTC (rev 15209) +++ branches/libspring-java/3.1/debian/control 2011-10-18 00:24:37 UTC (rev 15210) @@ -20,7 +20,7 @@ libquartz-java, librome-java, libservlet2.5-java, libspring-build-java, libstruts1.2-java, libtiles-java, libtomcat6-java, libvelocity-tools-java, libxmlbeans-java, libxstream-java, testng, velocity, libhttpcore-java, libhttpclient-java (>= 4.1.1), libservlet3.0-java, jruby, - libjoptsimple-java, libjsr166y-java + libjoptsimple-java, libjsr166y-java (>= 1.7.0~) Standards-Version: 3.9.2 Homepage: http://springframework.org/about Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-java/ @@ -67,7 +67,7 @@ Architecture: all Depends: ${misc:Depends}, libspring-aop-java (= ${source:Version}), libspring-beans-java (= ${source:Version}), libspring-core-java (= ${source:Version}), libspring-expression-java (= ${source:Version}) Recommends: libspring-instrument-java (= ${source:Version}), libbackport-util-concurrent-java, libtomcat6-java, libgeronimo-ejb-3.0-spec-java, libatinject-jsr330-api-java, glassfish-javaee, - libjodatime-java, libasm3-java, libaopalliance-java, libcglib-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java, libjsr166y-java + libjodatime-java, libasm3-java, libaopalliance-java, libcglib-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java, libjsr166y-java (>= 1.7.0~) Suggests: jruby, bsh, groovy Description: modular Java/J2EE application framework - Context Spring is a layered Java/J2EE application framework offering a lot of freedom Modified: branches/libspring-java/3.1/debian/patches/0012_forkjoinpool.diff =================================================================== --- branches/libspring-java/3.1/debian/patches/0012_forkjoinpool.diff 2011-10-17 22:03:17 UTC (rev 15209) +++ branches/libspring-java/3.1/debian/patches/0012_forkjoinpool.diff 2011-10-18 00:24:37 UTC (rev 15210) @@ -1,7 +1,7 @@ Description: Use ForkJoinPool API with JDK6 Author: Miguel Landaeta <[email protected]> Forwarded: no -Last-Update: 2011-10-15 +Last-Update: 2011-10-17 --- libspring-java-3.1.0~RC1.orig/projects/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java +++ libspring-java-3.1.0~RC1/projects/org.springframework.context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java @@ -10,7 +10,7 @@ package org.springframework.scheduling.concurrent; -import java.util.concurrent.ForkJoinPool; -+import jsr166y.forkjoin.ForkJoinPool; ++import jsr166y.ForkJoinPool; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
