[pkg-java] r15207 - in branches/libspring-java/3.1/debian: . patches
Miguel Landaeta
nomadium-guest at alioth.debian.org
Sat Oct 15 23:19:04 UTC 2011
Author: nomadium-guest
Date: 2011-10-15 23:19:04 +0000 (Sat, 15 Oct 2011)
New Revision: 15207
Added:
branches/libspring-java/3.1/debian/patches/0012_forkjoinpool.diff
Modified:
branches/libspring-java/3.1/debian/build-classpath
branches/libspring-java/3.1/debian/changelog
branches/libspring-java/3.1/debian/control
branches/libspring-java/3.1/debian/patches/0001_use_debian_asm3.diff
branches/libspring-java/3.1/debian/patches/0002_ivy_dependencies.diff
branches/libspring-java/3.1/debian/patches/series
branches/libspring-java/3.1/debian/rules
branches/libspring-java/3.1/debian/watch
Log:
NOTE: Work in progress, it FTBFS.
* New upstream release.
* Add Build-Depends on libjoptsimple-java and libjsr166y-java.
Modified: branches/libspring-java/3.1/debian/build-classpath
===================================================================
--- branches/libspring-java/3.1/debian/build-classpath 2011-10-15 22:46:49 UTC (rev 15206)
+++ branches/libspring-java/3.1/debian/build-classpath 2011-10-15 23:19:04 UTC (rev 15207)
@@ -63,8 +63,10 @@
/usr/share/java/jdo2-api.jar
/usr/share/java/jibx-run-1.2.jar
/usr/share/java/joda-time.jar
+/usr/share/java/joptsimple.jar
/usr/share/java/jsf-api.jar
/usr/share/java/jsp-api-2.1.jar
+/usr/share/java/jsr166y.jar
/usr/share/java/junit4.jar
/usr/share/java/jruby.jar
/usr/share/java/jxl.jar
Modified: branches/libspring-java/3.1/debian/changelog
===================================================================
--- branches/libspring-java/3.1/debian/changelog 2011-10-15 22:46:49 UTC (rev 15206)
+++ branches/libspring-java/3.1/debian/changelog 2011-10-15 23:19:04 UTC (rev 15207)
@@ -1,3 +1,12 @@
+libspring-java (3.1.0~RC1-1) UNRELEASED; urgency=low
+
+ NOTE: Work in progress, it FTBFS.
+
+ * New upstream release.
+ * Add Build-Depends on libjoptsimple-java and libjsr166y-java.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Sat, 15 Oct 2011 18:48:38 -0430
+
libspring-java (3.1.0~M2-2) experimental; urgency=low
[ Miguel Landaeta ]
Modified: branches/libspring-java/3.1/debian/control
===================================================================
--- branches/libspring-java/3.1/debian/control 2011-10-15 22:46:49 UTC (rev 15206)
+++ branches/libspring-java/3.1/debian/control 2011-10-15 23:19:04 UTC (rev 15207)
@@ -19,7 +19,8 @@
libjibx1.2-java, libjoda-time-java, libjsf-api-java, libopenjpa-java, libportlet-api-2.0-spec-java,
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
+ testng, velocity, libhttpcore-java, libhttpclient-java (>= 4.1.1), libservlet3.0-java, jruby,
+ libjoptsimple-java, libjsr166y-java
Standards-Version: 3.9.2
Homepage: http://springframework.org/about
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-java/
@@ -28,7 +29,7 @@
Package: libspring-core-java
Architecture: all
Depends: ${misc:Depends}, libasm3-java, libcommons-logging-java
-Suggests: libcommons-collections3-java, liblog4j1.2-java, libaspectj-java, libjboss-vfs-java
+Suggests: libcommons-collections3-java, liblog4j1.2-java, libaspectj-java, libjboss-vfs-java, libjoptsimple-java
Description: modular Java/J2EE application framework - Core
Spring is a layered Java/J2EE application framework offering a lot of freedom
to Java developers yet providing well documented and easy-to-use solutions for
@@ -66,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
+ libjodatime-java, libasm3-java, libaopalliance-java, libcglib-java, libgeronimo-validation-1.0-spec-java, libgeronimo-jms-1.1-spec-java, libjsr166y-java
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/0001_use_debian_asm3.diff
===================================================================
--- branches/libspring-java/3.1/debian/patches/0001_use_debian_asm3.diff 2011-10-15 22:46:49 UTC (rev 15206)
+++ branches/libspring-java/3.1/debian/patches/0001_use_debian_asm3.diff 2011-10-15 23:19:04 UTC (rev 15207)
@@ -3,20 +3,9 @@
- small fix to API usage
- disable build of org.springframework.asm module
Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-06-28
+Last-Update: 2011-10-13
Forwarded: no
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.core/ivy.xml
-@@ -28,7 +28,7 @@
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
- <!-- test dependencies -->
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
--- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+++ libspring-java-3.1.0~M2/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
@@ -28,12 +28,12 @@ import java.util.concurrent.ConcurrentHa
@@ -163,28 +152,6 @@
<path refid="unit.test.bundles" />
<pathelement location="../org.springframework.integration-tests"/>
<pathelement location="../org.springframework.spring-library"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.beans/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.beans/ivy.xml
-@@ -33,7 +33,7 @@
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
- <dependency org="org.hamcrest" name="com.springsource.org.hamcrest" rev="1.1.0" conf="test->runtime"/>
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
- </dependencies>
-
- </ivy-module>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.portlet/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.web.portlet/ivy.xml
-@@ -35,7 +35,7 @@
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
- </dependencies>
--- libspring-java-3.1.0~M2.orig/projects/org.springframework.spring-library/ivy.xml
+++ libspring-java-3.1.0~M2/projects/org.springframework.spring-library/ivy.xml
@@ -21,7 +21,7 @@
@@ -196,17 +163,6 @@
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="compile->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.integration-tests/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.integration-tests/ivy.xml
-@@ -77,7 +77,7 @@
- <dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="test->runtime"/>
- <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->compile"/>
--- libspring-java-3.1.0~M2.orig/projects/org.springframework.context/ivy.xml
+++ libspring-java-3.1.0~M2/projects/org.springframework.context/ivy.xml
@@ -53,7 +53,7 @@
@@ -242,14 +198,58 @@
<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0"
conf="test->compile"/>
<dependency org="org.dom4j" name="com.springsource.org.dom4j" rev="1.6.1" conf="test->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.aop/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.aop/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.core/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.core/ivy.xml
+@@ -28,7 +28,7 @@
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
++ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
+ <dependency org="net.sourceforge.jopt-simple" name="com.springsource.joptsimple" rev="3.0.0" conf="optional->compile"/>
+ <!-- test dependencies -->
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.beans/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.beans/ivy.xml
+@@ -33,7 +33,7 @@
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+ <dependency org="org.hamcrest" name="com.springsource.org.hamcrest" rev="1.1.0" conf="test->runtime"/>
+ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
++ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
+ </dependencies>
+
+ </ivy-module>
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.web.portlet/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.web.portlet/ivy.xml
+@@ -35,7 +35,7 @@
+ <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
++ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+ </dependencies>
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.integration-tests/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.integration-tests/ivy.xml
+@@ -75,7 +75,7 @@
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
+ <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
+ <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
+- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
++ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->compile"/>
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.aop/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.aop/ivy.xml
@@ -38,7 +38,7 @@
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
++ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
</dependencies>
</ivy-module>
Modified: branches/libspring-java/3.1/debian/patches/0002_ivy_dependencies.diff
===================================================================
--- branches/libspring-java/3.1/debian/patches/0002_ivy_dependencies.diff 2011-10-15 22:46:49 UTC (rev 15206)
+++ branches/libspring-java/3.1/debian/patches/0002_ivy_dependencies.diff 2011-10-15 23:19:04 UTC (rev 15207)
@@ -4,9 +4,9 @@
Last-Update: 2011-06-28
Forwarded: not-needed
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.core/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.core/ivy.xml
-@@ -25,9 +25,11 @@
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.core/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.core/ivy.xml
+@@ -25,11 +25,15 @@
</publications>
<dependencies>
@@ -15,11 +15,15 @@
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
+-->
- <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
+ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
++<!--
+ <dependency org="net.sourceforge.jopt-simple" name="com.springsource.joptsimple" rev="3.0.0" conf="optional->compile"/>
++-->
<!-- test dependencies -->
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.web/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.web/ivy.xml
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+ <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.web/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.web/ivy.xml
@@ -35,6 +35,7 @@
</publications>
@@ -36,32 +40,8 @@
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration"
conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.aspects/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.aspects/ivy.xml
-@@ -27,17 +27,21 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
- <dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional, orm->compile"/>
- <dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="context->compile"/>
- <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="optional, cache->compile"/>
-+<!--
- <dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional, orm->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
- <dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/>
-+-->
- </dependencies>
-
- </ivy-module>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.jdbc/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.jdbc/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.jdbc/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.jdbc/ivy.xml
@@ -26,16 +26,20 @@
</publications>
@@ -81,10 +61,10 @@
<dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="optional->compile"/>
+-->
<!-- test dependencies -->
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.transaction/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.transaction/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.transaction/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.transaction/ivy.xml
@@ -25,12 +25,14 @@
</publications>
@@ -100,8 +80,8 @@
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.expression/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.expression/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.expression/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.expression/ivy.xml
@@ -23,7 +23,9 @@
<dependencies>
@@ -112,8 +92,8 @@
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->runtime" />
<!-- test dependencies -->
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.beans/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.beans/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.beans/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.beans/ivy.xml
@@ -23,10 +23,12 @@
</publications>
@@ -127,8 +107,8 @@
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
<!-- test dependencies -->
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.portlet/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.web.portlet/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.web.portlet/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.web.portlet/ivy.xml
@@ -23,6 +23,7 @@
</publications>
@@ -145,8 +125,8 @@
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.test/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.test/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.test/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.test/ivy.xml
@@ -22,6 +22,7 @@
</publications>
@@ -157,7 +137,7 @@
<dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="test->compile"/>
@@ -37,6 +38,7 @@
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="optional->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="optional->compile"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->compile"/>
+-->
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
@@ -168,24 +148,25 @@
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="optional->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="optional->compile"/>
+<!--
- <dependency org="org.testng" name="com.springsource.org.testng" rev="${org.testng.version}" conf="optional->compile"/>
+ <dependency org="org.testng" name="com.springsource.org.testng" rev="${testng.version}" conf="optional->compile"/>
+-->
</dependencies>
</ivy-module>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.spring-library/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.spring-library/ivy.xml
-@@ -34,7 +34,7 @@
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.spring-library/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.spring-library/ivy.xml
+@@ -34,7 +34,9 @@
<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="compile->compile"/>
-- <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
-+ <!--<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>-->
++<!--
+ <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
++-->
</dependencies>
</ivy-module>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.integration-tests/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.integration-tests/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.integration-tests/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.integration-tests/ivy.xml
@@ -21,6 +21,7 @@
</publications>
@@ -194,16 +175,16 @@
<dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1" conf="test->compile"/>
<dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="test->compile"/>
<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="test->compile"/>
-@@ -77,6 +78,7 @@
- <dependency org="org.jboss.javassist" name="com.springsource.javassist" rev="3.3.0.ga" conf="test->runtime"/>
+@@ -75,6 +76,7 @@
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
+ <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
+-->
- <!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
+ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.context/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.context/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.context/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.context/ivy.xml
@@ -35,6 +35,7 @@
</publications>
@@ -212,7 +193,7 @@
<dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="optional, backport-util-concurrent->compile"/>
<dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="provided, ejb->compile"/>
<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="provided, ejb->compile"/>
-@@ -53,6 +54,7 @@
+@@ -54,6 +55,7 @@
<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.1.0.GA" conf="optional->compile"/>
<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/>
<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, jruby->compile"/>
@@ -220,7 +201,7 @@
<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
-@@ -60,7 +62,9 @@
+@@ -61,7 +63,9 @@
<dependency org="org.springframework" name="org.springframework.expression" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.instrument" rev="latest.integration" conf="optional, instrumentation->compile"/>
<!-- test dependencies -->
@@ -230,8 +211,8 @@
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="test->compile"/>
<dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="test->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="test->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.oxm/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.oxm/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.oxm/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.oxm/ivy.xml
@@ -28,6 +28,7 @@
</publications>
@@ -240,42 +221,16 @@
<dependency org="com.thoughtworks.xstream" name="com.springsource.com.thoughtworks.xstream" rev="1.3.1"
conf="optional, xstream->compile"/>
<dependency org="javax.xml.bind" name="com.springsource.javax.xml.bind" rev="2.1.7"
-@@ -36,13 +37,16 @@
- conf="optional, jibx->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
- conf="compile, commons-logging->compile"/>
-+-->
- <!--Xerces dependency should be removed when BRITS-259 is fixed-->
-+<!--
- <dependency org="org.apache.xerces" name="com.springsource.org.apache.xerces" rev="2.8.1"
- conf="optional, castor->compile"/>
- <dependency org="org.apache.xmlbeans" name="com.springsource.org.apache.xmlbeans" rev="2.4.0"
+@@ -40,6 +41,7 @@
conf="optional, xmlbeans->compile"/>
- <dependency org="org.codehaus.castor" name="com.springsource.org.castor" rev="1.2.0"
+ <dependency org="org.codehaus.castor" name="com.springsource.org.castor.xml" rev="1.3.2"
conf="optional, castor->compile"/>
+-->
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.struts/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.web.struts/ivy.xml
-@@ -23,12 +23,14 @@
- </publications>
-
- <dependencies>
-+<!--
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
- conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
- conf="compile->compile"/>
- <dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
-+-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
- conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.orm/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.orm/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.orm/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.orm/ivy.xml
@@ -33,6 +33,7 @@
</publications>
@@ -284,7 +239,7 @@
<dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="optional, toplink->compile"/>
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="optional, aop->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
-@@ -47,6 +48,7 @@
+@@ -48,6 +49,7 @@
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, jpa->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided, web->compile"/>
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
@@ -292,21 +247,20 @@
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="optional, aop->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.instrument.tomcat/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.instrument.tomcat/ivy.xml
-@@ -20,8 +20,10 @@
- <artifact name="notice" type="notice" ext="txt"/>
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.instrument.tomcat/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.instrument.tomcat/ivy.xml
+@@ -21,7 +21,9 @@
</publications>
-+<!--
<dependencies>
++<!--
<dependency org="org.apache.catalina" name="com.springsource.org.apache.catalina" rev="6.0.16" conf="provided->compile"/>
- </dependencies>
+-->
+ </dependencies>
</ivy-module>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.jms/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.jms/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.jms/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.jms/ivy.xml
@@ -23,6 +23,7 @@
</publications>
@@ -318,14 +272,14 @@
@@ -35,6 +36,7 @@
conf="optional, commons-pool->compile"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->compile"/>
+-->
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration"
conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.web.servlet/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.web.servlet/ivy.xml
-@@ -33,6 +33,7 @@
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.web.servlet/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.web.servlet/ivy.xml
+@@ -32,6 +32,7 @@
</publications>
<dependencies>
@@ -333,7 +287,7 @@
<dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0"
conf="optional, feed->compile"/>
<dependency org="com.lowagie.text" name="com.springsource.com.lowagie.text" rev="2.0.8"
-@@ -66,6 +67,7 @@
+@@ -69,6 +70,7 @@
conf="optional, velocity->compile"/>
<dependency org="org.codehaus.jackson" name="com.springsource.org.codehaus.jackson.mapper" rev="1.4.2"
conf="optional, jackson->compile"/>
@@ -341,17 +295,18 @@
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
-@@ -100,7 +102,7 @@
+@@ -101,7 +103,9 @@
conf="test->compile"/>
- <dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA"
+ <dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration"
conf="test->compile"/>
-- <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
-+ <!--<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>-->
++<!--
+ <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
++-->
<dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
- <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/>
+ <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.1.0.GA" conf="test->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.aop/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.aop/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.aop/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.aop/ivy.xml
@@ -26,12 +26,14 @@
</publications>
@@ -361,14 +316,14 @@
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool.version}" conf="optional, pooling->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.5.3" conf="optional, pooling->compile"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
+-->
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
<!-- test dependencies -->
---- libspring-java-3.1.0~M2.orig/projects/org.springframework.context.support/ivy.xml
-+++ libspring-java-3.1.0~M2/projects/org.springframework.context.support/ivy.xml
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.context.support/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.context.support/ivy.xml
@@ -30,6 +30,7 @@
</publications>
@@ -385,3 +340,44 @@
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.aspects/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.aspects/ivy.xml
+@@ -27,17 +27,21 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
+ <dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
+ <dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional, orm->compile"/>
+ <dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="context->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="optional, cache->compile"/>
++<!--
+ <dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional, orm->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->compile"/>
+ <dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/>
++-->
+ </dependencies>
+
+ </ivy-module>
+--- libspring-java-3.1.0~RC1.orig/projects/org.springframework.web.struts/ivy.xml
++++ libspring-java-3.1.0~RC1/projects/org.springframework.web.struts/ivy.xml
+@@ -23,12 +23,14 @@
+ </publications>
+
+ <dependencies>
++<!--
+ <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
+ conf="compile, commons-logging->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
+ conf="compile->compile"/>
+ <dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
++-->
+ <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
+ conf="compile->compile"/>
+ <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
Added: branches/libspring-java/3.1/debian/patches/0012_forkjoinpool.diff
===================================================================
--- branches/libspring-java/3.1/debian/patches/0012_forkjoinpool.diff (rev 0)
+++ branches/libspring-java/3.1/debian/patches/0012_forkjoinpool.diff 2011-10-15 23:19:04 UTC (rev 15207)
@@ -0,0 +1,16 @@
+Description: Use ForkJoinPool API with JDK6
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2011-10-15
+
+--- 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
+@@ -16,7 +16,7 @@
+
+ package org.springframework.scheduling.concurrent;
+
+-import java.util.concurrent.ForkJoinPool;
++import jsr166y.forkjoin.ForkJoinPool;
+
+ import org.springframework.beans.factory.DisposableBean;
+ import org.springframework.beans.factory.FactoryBean;
Modified: branches/libspring-java/3.1/debian/patches/series
===================================================================
--- branches/libspring-java/3.1/debian/patches/series 2011-10-15 22:46:49 UTC (rev 15206)
+++ branches/libspring-java/3.1/debian/patches/series 2011-10-15 23:19:04 UTC (rev 15207)
@@ -7,4 +7,5 @@
0008_jpa_20_api.diff
0009_hibernate_validator_41.diff
0010_httpclient_41.diff
-0011_servlet_30.diff
+#0011_servlet_30.diff
+0012_forkjoinpool.diff
Modified: branches/libspring-java/3.1/debian/rules
===================================================================
--- branches/libspring-java/3.1/debian/rules 2011-10-15 22:46:49 UTC (rev 15206)
+++ branches/libspring-java/3.1/debian/rules 2011-10-15 23:19:04 UTC (rev 15207)
@@ -2,7 +2,7 @@
PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//')
-UVERSION := $(shell echo ${VERSION} | sed 's/~M/.M/')
+UVERSION := $(shell echo ${VERSION} | sed -r 's/~(M|RC)/.\1/')
JAVA_HOME := /usr/lib/jvm/default-java
ANT_ARGS := -propertyfile debian/ant.properties
Modified: branches/libspring-java/3.1/debian/watch
===================================================================
--- branches/libspring-java/3.1/debian/watch 2011-10-15 22:46:49 UTC (rev 15206)
+++ branches/libspring-java/3.1/debian/watch 2011-10-15 23:19:04 UTC (rev 15207)
@@ -1,4 +1,4 @@
version=3
-opts="uversionmangle=s/\.M/~M/" \
+opts="uversionmangle=s/\.(M|RC)(.*)/~$1$2/" \
https://src.springframework.org/svn/spring-framework/tags/ \
spring-framework-(.*)/
More information about the pkg-java-commits
mailing list