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

Fri Feb 26 19:28:26 UTC 2010

Author: drazzib
Date: 2010-02-26 19:28:25 +0000 (Fri, 26 Feb 2010)
New Revision: 11721

Added:
   trunk/libspring-2.5-java/debian/source/
   trunk/libspring-2.5-java/debian/source/format
Modified:
   trunk/libspring-2.5-java/debian/README.Debian
   trunk/libspring-2.5-java/debian/README.source
   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
   trunk/libspring-2.5-java/debian/rules
Log:
* Standards-Version to 3.8.4.
* Source format 3.0 (quilt).
* Move package duty under Debian Java Maintainers umbrella
  and add myself to Uploaders.
* Disable JRuby scripting module and remove B-D since jruby Debian
  package has moved to non-free archive.

Modified: trunk/libspring-2.5-java/debian/README.Debian
===================================================================

--- trunk/libspring-2.5-java/debian/README.Debian	2010-02-26 13:42:39 UTC (rev 11720)
+++ trunk/libspring-2.5-java/debian/README.Debian	2010-02-26 19:28:25 UTC (rev 11721)
@@ -15,6 +15,8 @@
     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-context-support
   [non-free] BEA CommonJ is non-free
@@ -59,9 +61,6 @@
 JUnit 4.5 instead of JUnit 4.3
   see debian/patches/09_junit_45.dpatch in debian diff
 
-JRuby 1.2 instead of JRuby 1.0
-  see debian/patches/10_jruby_11.dpatch 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/README.source
===================================================================
--- trunk/libspring-2.5-java/debian/README.source	2010-02-26 13:42:39 UTC (rev 11720)
+++ trunk/libspring-2.5-java/debian/README.source	2010-02-26 19:28:25 UTC (rev 11721)
@@ -1,12 +1,3 @@
-Patch System
-============
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
-
 Original tarball repack
 =======================
 How to prepare the original source:

Modified: trunk/libspring-2.5-java/debian/changelog
===================================================================
--- trunk/libspring-2.5-java/debian/changelog	2010-02-26 13:42:39 UTC (rev 11720)
+++ trunk/libspring-2.5-java/debian/changelog	2010-02-26 19:28:25 UTC (rev 11721)
@@ -1,4 +1,4 @@
-libspring-2.5-java (2.5.6.SEC01-8) UNRELEASED; urgency=low
+libspring-2.5-java (2.5.6.SEC01-8) unstable; urgency=low
 
   * New libspring-webmvc-struts-2.5-java binary package
     for webmvc-struts.jar. (Closes: #570533)
@@ -8,8 +8,14 @@
     Thanks to Per Wawra <debian.perfide at safersignup.com>.
   * Replace B-D/D on glassfish-appserv by glassfish-javaee since
     glassfish-appserv-jstl.jar is now in glassfish-appserv.
+  * Standards-Version to 3.8.4.
+  * Source format 3.0 (quilt).
+  * Move package duty under Debian Java Maintainers umbrella
+    and add myself to Uploaders.
+  * Disable JRuby scripting module and remove B-D since jruby Debian
+    package has moved to non-free archive.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 20 Feb 2010 23:40:55 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 26 Feb 2010 20:26:51 +0100
 
 libspring-2.5-java (2.5.6.SEC01-7) unstable; urgency=low
 

Modified: trunk/libspring-2.5-java/debian/control
===================================================================
--- trunk/libspring-2.5-java/debian/control	2010-02-26 13:42:39 UTC (rev 11720)
+++ trunk/libspring-2.5-java/debian/control	2010-02-26 19:28:25 UTC (rev 11721)
@@ -1,20 +1,20 @@
 Source: libspring-2.5-java
 Section: java
 Priority: extra
-Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Uploaders: Andreas Schildbach <debian.org at schildbach.de>
-Build-Depends: quilt, debhelper (>= 7.0.50~), ant, openjdk-6-jdk
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Andreas Schildbach <debian.org at schildbach.de>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
 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,
- jruby, libfreemarker-java, velocity, liblog4j1.2-java, libcommons-fileupload-java,
+ 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, libqdox-java, libjarjar-java,
  libhibernate3-java, libhibernate-commons-annotations-java, libhibernate-annotations-java,
  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, aspectj (>= 1.6.4), libjasperreports-java,
  maven-repo-helper
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://springframework.org/about
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-2.5-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-2.5-java/
@@ -56,7 +56,7 @@
 Architecture: all
 Depends: ${misc:Depends}, openjdk-6-jre | java2-runtime, libspring-beans-2.5-java
 Recommends: libspring-aop-2.5-java, glassfish-javaee
-Suggests: jruby, bsh, groovy
+Suggests: 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	2010-02-26 13:42:39 UTC (rev 11720)
+++ trunk/libspring-2.5-java/debian/excludesfiles/main.excludes	2010-02-26 19:28:25 UTC (rev 11721)
@@ -1,6 +1,7 @@
 # spring-context-support
 # BEA CommonJ is non-free
 org/springframework/scheduling/commonj/**
+org/springframework/scripting/jruby/**
 
 # spring-orm
 # We doesn't support TopLink 9.0.4 (non-free)

Modified: trunk/libspring-2.5-java/debian/patches/series
===================================================================
--- trunk/libspring-2.5-java/debian/patches/series	2010-02-26 13:42:39 UTC (rev 11720)
+++ trunk/libspring-2.5-java/debian/patches/series	2010-02-26 19:28:25 UTC (rev 11721)
@@ -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

Modified: trunk/libspring-2.5-java/debian/rules
===================================================================
--- trunk/libspring-2.5-java/debian/rules	2010-02-26 13:42:39 UTC (rev 11720)
+++ trunk/libspring-2.5-java/debian/rules	2010-02-26 19:28:25 UTC (rev 11721)
@@ -13,7 +13,7 @@
 ANT             := CLASSPATH=/usr/share/java/jarjar.jar JAVA_HOME=$(JAVA_HOME) ant
 
 %:
-	dh $@ --buildsystem=ant --with quilt
+	dh $@ --buildsystem=ant
 
 override_dh_auto_clean:
 	$(ANT) clean

Added: trunk/libspring-2.5-java/debian/source/format
===================================================================
--- trunk/libspring-2.5-java/debian/source/format	                        (rev 0)
+++ trunk/libspring-2.5-java/debian/source/format	2010-02-26 19:28:25 UTC (rev 11721)
@@ -0,0 +1 @@
+3.0 (quilt)


