[pkg-java] r14964 - in trunk/libspring-java/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-09-20 17:11:35 +0000 (Tue, 20 Sep 2011)
New Revision: 14964

Removed:
   trunk/libspring-java/debian/patches/0007_no_jruby.diff
Modified:
   trunk/libspring-java/debian/build-classpath
   trunk/libspring-java/debian/changelog
   trunk/libspring-java/debian/control
   trunk/libspring-java/debian/patches/series
Log:
Since JRuby is now in main, re-enable it in libspring-context-java.

Modified: trunk/libspring-java/debian/build-classpath
===================================================================
--- trunk/libspring-java/debian/build-classpath	2011-09-20 17:08:50 UTC (rev 14963)
+++ trunk/libspring-java/debian/build-classpath	2011-09-20 17:11:35 UTC (rev 14964)
@@ -63,6 +63,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: trunk/libspring-java/debian/changelog
===================================================================
--- trunk/libspring-java/debian/changelog	2011-09-20 17:08:50 UTC (rev 14963)
+++ trunk/libspring-java/debian/changelog	2011-09-20 17:11:35 UTC (rev 14964)
@@ -1,3 +1,9 @@
+libspring-java (3.0.6.RELEASE-3) unstable; urgency=low
+
+  * Since JRuby is now in main, re-enable it in libspring-context-java.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 20 Sep 2011 18:53:09 +0200
+
 libspring-java (3.0.6.RELEASE-2) unstable; urgency=low
 
   * Use jibx-run-1.2.jar symlink in build classpath. (Closes: #640741).

Modified: trunk/libspring-java/debian/control
===================================================================
--- trunk/libspring-java/debian/control	2011-09-20 17:08:50 UTC (rev 14963)
+++ trunk/libspring-java/debian/control	2011-09-20 17:11:35 UTC (rev 14964)
@@ -19,7 +19,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
+ testng, velocity, jruby
 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 @@
 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: trunk/libspring-java/debian/patches/0007_no_jruby.diff
===================================================================
--- trunk/libspring-java/debian/patches/0007_no_jruby.diff	2011-09-20 17:08:50 UTC (rev 14963)
+++ trunk/libspring-java/debian/patches/0007_no_jruby.diff	2011-09-20 17:11:35 UTC (rev 14964)
@@ -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: trunk/libspring-java/debian/patches/series
===================================================================
--- trunk/libspring-java/debian/patches/series	2011-09-20 17:08:50 UTC (rev 14963)
+++ trunk/libspring-java/debian/patches/series	2011-09-20 17:11:35 UTC (rev 14964)
@@ -4,6 +4,5 @@
 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