[pkg-java] r13039 - branches/mina2/squeeze/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-10-29 20:27:20 +0000 (Fri, 29 Oct 2010)
New Revision: 13039

Modified:
   branches/mina2/squeeze/debian/build.xml
   branches/mina2/squeeze/debian/changelog
   branches/mina2/squeeze/debian/control
   branches/mina2/squeeze/debian/rules
Log:
Upload to t-p-u

Modified: branches/mina2/squeeze/debian/build.xml
===================================================================
--- branches/mina2/squeeze/debian/build.xml	2010-10-29 05:18:37 UTC (rev 13038)
+++ branches/mina2/squeeze/debian/build.xml	2010-10-29 20:27:20 UTC (rev 13039)
@@ -42,12 +42,12 @@
 		<param name="component" value="integration-beans"/>
 		<param name="classpath" value="${build.dir}/core"/>
 	</antcall>
-
+<!--
 	<antcall target="-compile">
 		<param name="component" value="transport-serial"/>
 		<param name="classpath" value="${build.dir}/core:${build.dir}/integration-beans"/>
 	</antcall>
-	
+-->
 	<antcall target="-compile">
 		<param name="component" value="integration-xbean"/>
 		<param name="classpath" value="${build.dir}/core:${build.dir}/integration-beans"/>
@@ -69,7 +69,9 @@
 	<antcall target="-jar"><param name="component" value="filter-compression"/></antcall>
 	<antcall target="-jar"><param name="component" value="transport-apr"/></antcall>
 	<antcall target="-jar"><param name="component" value="integration-beans"/></antcall>
+<!--
 	<antcall target="-jar"><param name="component" value="transport-serial"/></antcall>
+-->
 	<antcall target="-jar"><param name="component" value="integration-xbean"/></antcall>
 	<antcall target="-jar"><param name="component" value="integration-ognl"/></antcall>
 	<antcall target="-jar"><param name="component" value="integration-jmx"/></antcall>
@@ -91,7 +93,9 @@
 			<include name="${src.dir}/mina-core/src/main/**/*.java"/>
 			<include name="${src.dir}/mina-filter-compression/src/main/**/*.java"/>
 			<include name="${src.dir}/mina-transport-apr/src/main/**/*.java"/>
+<!--
 			<include name="${src.dir}/mina-transport-serial/src/main/**/*.java"/>
+-->
 			<include name="${src.dir}/mina-integration-beans/src/main/**/*.java"/>
 			<include name="${src.dir}/mina-integration-xbean/src/main/**/*.java"/>
 			<include name="${src.dir}/mina-integration-ognl/src/main/**/*.java"/>

Modified: branches/mina2/squeeze/debian/changelog
===================================================================
--- branches/mina2/squeeze/debian/changelog	2010-10-29 05:18:37 UTC (rev 13038)
+++ branches/mina2/squeeze/debian/changelog	2010-10-29 20:27:20 UTC (rev 13039)
@@ -1,18 +1,14 @@
-mina2 (2.0.0+dfsg-1) unstable; urgency=low
+mina2 (2.0.0+dfsg-0squeeze1) testing-proposed-updates; urgency=low
 
   * New upstream final release:
     - d/rules: No more mina-parent pom.
     - d/watch: Only track stable releases now.
   * Update Standards-Version 3.9.1: no changes needed.
-  * Enable rxtx support:
-    - d/control: Add Build-Depends on librxtx-java.
-    - d/build.xml: Enable build of transport-serial module.
-    - d/rules: Include RXTXcomm.jar in classpath.
   * d/copyright: Updated and migrated to DEP-5 format.
   * d/control: Fix Vcs-* to use mina2 repository.
   * d/control: Drop depends on JRE runtime (aka new Java Policy).
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 02 Oct 2010 14:12:30 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 29 Oct 2010 22:24:58 +0200
 
 mina2 (2.0.0~RC1+dfsg-2) unstable; urgency=low
 

Modified: branches/mina2/squeeze/debian/control
===================================================================
--- branches/mina2/squeeze/debian/control	2010-10-29 05:18:37 UTC (rev 13038)
+++ branches/mina2/squeeze/debian/control	2010-10-29 20:27:20 UTC (rev 13039)
@@ -5,7 +5,7 @@
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 7), ant, cdbs, openjdk-6-jdk
 Build-Depends-Indep: libslf4j-java, libjzlib-java,
-  libmx4j-java, libspring-beans-2.5-java, libtomcat6-java, libognl-java, librxtx-java,
+  libmx4j-java, libspring-beans-2.5-java, libtomcat6-java, libognl-java,
   maven-repo-helper
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mina2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mina2

Modified: branches/mina2/squeeze/debian/rules
===================================================================
--- branches/mina2/squeeze/debian/rules	2010-10-29 05:18:37 UTC (rev 13038)
+++ branches/mina2/squeeze/debian/rules	2010-10-29 20:27:20 UTC (rev 13039)
@@ -7,8 +7,7 @@
 JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 
 DEB_JARS  := slf4j-api jzlib mx4j spring-core spring-beans ognl \
-             /usr/share/tomcat6/lib/tomcat-coyote.jar \
-             RXTXcomm.jar
+             /usr/share/tomcat6/lib/tomcat-coyote.jar
 DEB_ANT_BUILDFILE := debian/build.xml
 DEB_ANT_ARGS := -Ddeb.package=${DEB_SOURCE_PACKAGE}
 DEB_ANT_BUILD_TARGET := jar.all javadoc