[pkg-java] r14962 - in trunk/libspring-2.5-java/debian: . excludesfiles patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-09-20 17:08:06 +0000 (Tue, 20 Sep 2011)
New Revision: 14962

Modified:
   trunk/libspring-2.5-java/debian/README.Debian
   trunk/libspring-2.5-java/debian/changelog
   trunk/libspring-2.5-java/debian/control
   trunk/libspring-2.5-java/debian/excludesfiles/main.excludes
   trunk/libspring-2.5-java/debian/patches/series
Log:
Since JRuby is now in main, re-enable it in libspring-context-2.5-java.

Modified: trunk/libspring-2.5-java/debian/README.Debian
===================================================================
--- trunk/libspring-2.5-java/debian/README.Debian	2011-09-20 17:00:30 UTC (rev 14961)
+++ trunk/libspring-2.5-java/debian/README.Debian	2011-09-20 17:08:06 UTC (rev 14962)
@@ -15,8 +15,6 @@
     org/springframework/instrument/classloading/glassfish/**
   [non-free] Oracle OC4J is non-free
     org/springframework/instrument/classloading/oc4j/**
-  [non-free] Debian JRuby package is in non-free archive
-    org/springframework/scripting/jruby/**
 
 * spring-orm
   [non-free] Oracle TopLink 9.0.4 is non-free
@@ -40,6 +38,9 @@
 JUnit 4.5 instead of JUnit 4.3
   see debian/patches/09_junit_45.dpatch in debian diff
 
+JRuby 1.5 instead of JRuby 1.0
+  see debian/patches/10_jruby_11.diff in debian diff
+
 Compatibility with Servlet 2.5 and JSP 2.1 API
   see debian/patches/11_servlet_jsp_api.dpatch in debian diff
 

Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog	2011-09-20 17:00:30 UTC (rev 14961)
+++ trunk/libspring-2.5-java/debian/changelog	2011-09-20 17:08:06 UTC (rev 14962)
@@ -1,3 +1,9 @@
+libspring-2.5-java (2.5.6.SEC02-6) unstable; urgency=low
+
+  * Since JRuby is now in main, re-enable it in libspring-context-2.5-java.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 20 Sep 2011 18:53:29 +0200
+
 libspring-2.5-java (2.5.6.SEC02-5) unstable; urgency=low
 
   [ Torsten Werner ]

Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control	2011-09-20 17:00:30 UTC (rev 14961)
+++ trunk/libspring-2.5-java/debian/control	2011-09-20 17:08:06 UTC (rev 14962)
@@ -14,7 +14,7 @@
  libehcache-java, libibatis-java, libquartz-java, libxapool-java, libtiles-java (>= 2.2.1), libvelocity-tools-java,
  glassfish-toplink-essentials, libtomcat6-java, junit4 (>= 4.5), testng, libaspectj-java (>= 1.6.4), libjasperreports-java,
  maven-repo-helper, libportlet-api-2.0-spec-java, libjsf-api-java, libhessian-java, libgeronimo-commonj-spec-java,
- libeclipselink-java, libopenjpa-java
+ libeclipselink-java, libopenjpa-java, jruby
 Standards-Version: 3.9.2
 Homepage: http://springframework.org/about
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-2.5-java/
@@ -57,7 +57,7 @@
 Architecture: all
 Depends: ${misc:Depends}, libspring-beans-2.5-java
 Recommends: libspring-aop-2.5-java, glassfish-javaee
-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

Modified: trunk/libspring-2.5-java/debian/excludesfiles/main.excludes
===================================================================
--- trunk/libspring-2.5-java/debian/excludesfiles/main.excludes	2011-09-20 17:00:30 UTC (rev 14961)
+++ trunk/libspring-2.5-java/debian/excludesfiles/main.excludes	2011-09-20 17:08:06 UTC (rev 14962)
@@ -1,7 +1,3 @@
-# spring-context-support
-# JRuby is non-free
-org/springframework/scripting/jruby/**
-
 # spring-orm
 # We doesn't support TopLink 9.0.4 (non-free)
 org/springframework/orm/toplink/SessionBrokerSessionFactory.java

Modified: trunk/libspring-2.5-java/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series	2011-09-20 17:00:30 UTC (rev 14961)
+++ trunk/libspring-2.5-java/debian/patches/series	2011-09-20 17:08:06 UTC (rev 14962)
@@ -6,7 +6,7 @@
 #06_no_jsf.diff
 08_use_glasshfish_toplink.diff
 09_junit_45.diff
-#10_jruby_11.diff
+10_jruby_11.diff
 11_servlet_jsp_api.diff
 12_aspectj_164.diff
 13_tiles_22.diff