[pkg-java] r14970 - in branches/libspring-java/3.1/debian: . patches
Miguel Landaeta
nomadium-guest at alioth.debian.org
Wed Sep 21 01:22:03 UTC 2011
Author: nomadium-guest
Date: 2011-09-21 01:22:03 +0000 (Wed, 21 Sep 2011)
New Revision: 14970
Removed:
branches/libspring-java/3.1/debian/patches/0007_no_jruby.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/series
Log:
Since JRuby is now in main, re-enable it in libspring-context-java
Modified: branches/libspring-java/3.1/debian/build-classpath
===================================================================
--- branches/libspring-java/3.1/debian/build-classpath 2011-09-20 21:19:45 UTC (rev 14969)
+++ branches/libspring-java/3.1/debian/build-classpath 2011-09-21 01:22:03 UTC (rev 14970)
@@ -66,6 +66,7 @@
/usr/share/java/jsf-api.jar
/usr/share/java/jsp-api-2.1.jar
/usr/share/java/junit4.jar
+/usr/share/java/jruby.jar
/usr/share/java/jxl.jar
/usr/share/java/openjpa.jar
/usr/share/java/portlet-api.jar
Modified: branches/libspring-java/3.1/debian/changelog
===================================================================
--- branches/libspring-java/3.1/debian/changelog 2011-09-20 21:19:45 UTC (rev 14969)
+++ branches/libspring-java/3.1/debian/changelog 2011-09-21 01:22:03 UTC (rev 14970)
@@ -1,9 +1,13 @@
-libspring-java (3.1.0~M2-2) UNRELEASED; urgency=low
+libspring-java (3.1.0~M2-1miguel1) unstable; urgency=low
+ [ Miguel Landaeta ]
* Use jibx-run-1.2.jar symlink in build classpath.
- -- Miguel Landaeta <miguel at miguel.cc> Tue, 06 Sep 2011 21:45:02 -0430
+ [ Damien Raude-Morvan ]
+ * Since JRuby is now in main, re-enable it in libspring-context-java.
+ -- Miguel Landaeta <miguel at miguel.cc> Tue, 20 Sep 2011 19:33:09 -0430
+
libspring-java (3.1.0~M2-1) experimental; urgency=low
[ Miguel Landaeta ]
Modified: branches/libspring-java/3.1/debian/control
===================================================================
--- branches/libspring-java/3.1/debian/control 2011-09-20 21:19:45 UTC (rev 14969)
+++ branches/libspring-java/3.1/debian/control 2011-09-21 01:22:03 UTC (rev 14970)
@@ -18,7 +18,7 @@
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
+ testng, velocity, libhttpcore-java, libhttpclient-java (>= 4.1.1), libservlet3.0-java, jruby
Standards-Version: 3.9.2
Homepage: http://springframework.org/about
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-java/
@@ -66,7 +66,7 @@
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
-Suggests: bsh, groovy
+Suggests: jruby, bsh, groovy
Description: modular Java/J2EE application framework - Context
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
Deleted: branches/libspring-java/3.1/debian/patches/0007_no_jruby.diff
===================================================================
--- branches/libspring-java/3.1/debian/patches/0007_no_jruby.diff 2011-09-20 21:19:45 UTC (rev 14969)
+++ branches/libspring-java/3.1/debian/patches/0007_no_jruby.diff 2011-09-21 01:22:03 UTC (rev 14970)
@@ -1,23 +0,0 @@
-Description: JRuby is not available in main yet
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: not-needed
-Last-Update: 2010-07-01
-
---- a/projects/org.springframework.context/build.xml
-+++ b/projects/org.springframework.context/build.xml
-@@ -4,4 +4,15 @@
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
- <import file="${basedir}/../spring-build/standard/default.xml"/>
-+
-+ <macrodef name="pre-compile">
-+ <attribute name="classpath.id"/>
-+ <attribute name="input.dir"/>
-+ <attribute name="output.dir"/>
-+ <attribute name="resources.dir"/>
-+ <sequential>
-+ <delete dir="${basedir}/src/main/java/org/springframework/scripting/jruby"/>
-+ </sequential>
-+ </macrodef>
-+
- </project>
Modified: branches/libspring-java/3.1/debian/patches/series
===================================================================
--- branches/libspring-java/3.1/debian/patches/series 2011-09-20 21:19:45 UTC (rev 14969)
+++ branches/libspring-java/3.1/debian/patches/series 2011-09-21 01:22:03 UTC (rev 14970)
@@ -4,7 +4,6 @@
0004_no_derby_db.diff
0005_commonj.diff
0006_aspectj_classpath.diff
-0007_no_jruby.diff
0008_jpa_20_api.diff
0009_hibernate_validator_41.diff
0010_httpclient_41.diff
More information about the pkg-java-commits
mailing list