[pkg-java] r11246 - trunk/libspring-2.5-java/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-12-12 12:55:19 +0000 (Sat, 12 Dec 2009)
New Revision: 11246

Modified:
   trunk/libspring-2.5-java/debian/changelog
   trunk/libspring-2.5-java/debian/classpath-debian
   trunk/libspring-2.5-java/debian/control
   trunk/libspring-2.5-java/debian/maven.rules
   trunk/libspring-2.5-java/debian/rules
Log:
  - Replace dh_clean -k by dh_prep
* Replace Depends and BUild-Depends on "jruby1.2" by "jruby" (1.4)

Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog	2009-12-12 00:35:34 UTC (rev 11245)
+++ trunk/libspring-2.5-java/debian/changelog	2009-12-12 12:55:19 UTC (rev 11246)
@@ -5,6 +5,7 @@
     - Fix debian/classpath-debian
   * Upgrade debian/copyright to DEP5
   * Bump debhelper version to >= 7
+    - Replace dh_clean -k by dh_prep
   * Maven POMs:
     - Add a Build-Depends-Indep dependency on maven-repo-helper
     - Use mh_installpoms and mh_installjar to install the POM and the jar to the
@@ -13,11 +14,9 @@
     - debian/poms/*.xml: Debian crafted pom.xml files
     - debian/rules: new get-orig-pom to update debian/poms/*.xml at new upstream
       release.
-  
-  TODO FIX MANIFEST CLASSPATH : #557685
-  TODO wait for jruby package (as jruby1.2 may be deprecated soon)
+  * Replace Depends and BUild-Depends on "jruby1.2" by "jruby" (1.4)
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 27 Nov 2009 00:13:27 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 13:55:04 +0100
 
 libspring-2.5-java (2.5.6.SEC01-6) unstable; urgency=low
 

Modified: trunk/libspring-2.5-java/debian/classpath-debian
===================================================================
--- trunk/libspring-2.5-java/debian/classpath-debian	2009-12-12 00:35:34 UTC (rev 11245)
+++ trunk/libspring-2.5-java/debian/classpath-debian	2009-12-12 12:55:19 UTC (rev 11246)
@@ -15,7 +15,7 @@
 usr/share/java/commons-httpclient.jar
 usr/share/java/axis.jar
 usr/share/java/groovy.jar
-usr/share/java/jruby1.2.jar
+usr/share/java/jruby.jar
 usr/share/java/freemarker.jar
 usr/share/java/velocity.jar
 usr/share/java/log4j-1.2.jar

Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control	2009-12-12 00:35:34 UTC (rev 11245)
+++ trunk/libspring-2.5-java/debian/control	2009-12-12 12:55:19 UTC (rev 11246)
@@ -7,7 +7,7 @@
 Build-Depends-Indep: libcommons-logging-java, libcommons-attributes-java (>= 2.2-4), libaopalliance-java,
  libjamon-java, libcommons-pool-java, libcommons-collections3-java, libbackport-util-concurrent-java, libasm2-java,
  libc3p0-java, libgnumail-java, libjdo-api-java, libcommons-httpclient-java, libaxis-java, groovy,
- jruby1.2, libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
+ jruby, libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
  libjakarta-poi-java, libjexcelapi-java, libitext-java, libstruts1.2-java, libdom4j-java,
  libcglib-java, bsh, glassfish-javaee, glassfish-appserv, libqdox-java, libjarjar-java,
  libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
@@ -56,7 +56,7 @@
 Architecture: all
 Depends: openjdk-6-jre | java2-runtime, libspring-beans-2.5-java
 Recommends: libspring-aop-2.5-java, glassfish-javaee
-Suggests: jruby1.2, 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/maven.rules
===================================================================
--- trunk/libspring-2.5-java/debian/maven.rules	2009-12-12 00:35:34 UTC (rev 11245)
+++ trunk/libspring-2.5-java/debian/maven.rules	2009-12-12 12:55:19 UTC (rev 11246)
@@ -1,9 +1,10 @@
 org.springframework * * s/2\..*/2.x/
 log4j log4j jar s/1\.2\..*/1.2.x/
 commons-collections commons-collections jar s/3\..*/3.x/
-s/velocity/org.apache.velocity/ velocity jar *
-s/velocity-tools/org.apache.velocity/ velocity-tools jar *
+s/velocity/org.apache.velocity/ velocity jar s/.*/debian/
+s/velocity-tools/org.apache.velocity/ velocity-tools jar s/.*/debian/
 asm * jar s/.*/3.x/
 commons-httpclient commons-httpclient jar s/.*/3.x/
 javax.servlet servlet-api jar s/.*/2.5/
 s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/.*/2.1/
+s/jexcelapi/net.sourceforge.jexcelapi/ jxl jar s/.*/debian/

Modified: trunk/libspring-2.5-java/debian/rules
===================================================================
--- trunk/libspring-2.5-java/debian/rules	2009-12-12 00:35:34 UTC (rev 11245)
+++ trunk/libspring-2.5-java/debian/rules	2009-12-12 12:55:19 UTC (rev 11246)
@@ -28,7 +28,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 
 # Build architecture-independent files here.
 binary-indep: build install