[pkg-java] r13012 - trunk/mina2/debian

Sat Oct 2 12:30:45 UTC 2010

Author: drazzib
Date: 2010-10-02 12:30:44 +0000 (Sat, 02 Oct 2010)
New Revision: 13012

Added:
   trunk/mina2/debian/README.source
Modified:
   trunk/mina2/debian/README.Debian
   trunk/mina2/debian/build.xml
   trunk/mina2/debian/changelog
   trunk/mina2/debian/control
   trunk/mina2/debian/copyright
   trunk/mina2/debian/orig-tar.sh
   trunk/mina2/debian/rules
   trunk/mina2/debian/watch
Log:
* 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).

Modified: trunk/mina2/debian/README.Debian
===================================================================

--- trunk/mina2/debian/README.Debian	2010-10-02 11:46:11 UTC (rev 13011)
+++ trunk/mina2/debian/README.Debian	2010-10-02 12:30:44 UTC (rev 13012)
@@ -1,6 +1,5 @@
 This package doesn't contain the following components:
 - filter-codec-netty - requires netty2 which is obsolete
-- transport-serial - require rxtx (gnu.io) not yet in Debian
 
 NTLM provider won't work with MD4 cipher as MD4.java and MD4Provider.java
 were removed from original tarball due to licensing issues.

Added: trunk/mina2/debian/README.source
===================================================================
--- trunk/mina2/debian/README.source	                        (rev 0)
+++ trunk/mina2/debian/README.source	2010-10-02 12:30:44 UTC (rev 13012)
@@ -0,0 +1,11 @@
+Repackaged upstream tarball (aka +dfsg version)
+===============================================
+
+  The upstream tarball of mina as been stripped to make a DFSG version.
+  Items removed from upstream :
+  - all packaged JAR
+  - non-free VSD files (MS Visio)
+  - non-free MD4 from MD4.java
+  - generated Javadoc and Xref
+  - LICENCE.*.txt from other projects
+

Modified: trunk/mina2/debian/build.xml
===================================================================
--- trunk/mina2/debian/build.xml	2010-10-02 11:46:11 UTC (rev 13011)
+++ trunk/mina2/debian/build.xml	2010-10-02 12:30:44 UTC (rev 13012)
@@ -37,16 +37,16 @@
 		<param name="component" value="transport-apr"/>
 		<param name="classpath" value="${build.dir}/core"/>
 	</antcall>
-	
-	<!--antcall target="-compile">
-		<param name="component" value="transport-serial"/>
-		<param name="classpath" value="${build.dir}/core"/>
-	</antcall-->
-	
+
 	<antcall target="-compile">
 		<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"/>
@@ -68,8 +68,8 @@
 	<antcall target="-jar"><param name="component" value="core"/></antcall>
 	<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="transport-serial"/></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 +91,7 @@
 			<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-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: trunk/mina2/debian/changelog
===================================================================
--- trunk/mina2/debian/changelog	2010-10-02 11:46:11 UTC (rev 13011)
+++ trunk/mina2/debian/changelog	2010-10-02 12:30:44 UTC (rev 13012)
@@ -1,3 +1,19 @@
+mina2 (2.0.0+dfsg-1) unstable; 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
+
 mina2 (2.0.0~RC1+dfsg-2) unstable; urgency=low
 
   [ Damien Raude-Morvan ]

Modified: trunk/mina2/debian/control
===================================================================
--- trunk/mina2/debian/control	2010-10-02 11:46:11 UTC (rev 13011)
+++ trunk/mina2/debian/control	2010-10-02 12:30:44 UTC (rev 13012)
@@ -5,16 +5,16 @@
 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,
+  libmx4j-java, libspring-beans-2.5-java, libtomcat6-java, libognl-java, librxtx-java,
   maven-repo-helper
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mina
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mina
-Standards-Version: 3.8.4
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mina2
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mina2
+Standards-Version: 3.9.1
 Homepage: http://mina.apache.org
 
 Package: libmina2-java
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre-headless | java5-runtime-headless, libslf4j-java
+Depends: ${misc:Depends}, libslf4j-java
 Recommends: libjzlib-java, libmx4j-java, libtomcat6-java, libognl-java
 Suggests: libmina-java-doc, libspring-beans-2.5-java
 Description: Java network application framework

Modified: trunk/mina2/debian/copyright
===================================================================
--- trunk/mina2/debian/copyright	2010-10-02 11:46:11 UTC (rev 13011)
+++ trunk/mina2/debian/copyright	2010-10-02 12:30:44 UTC (rev 13012)
@@ -1,29 +1,18 @@
-This package was Debianised by Damien Raude-Morvan <drazzib at debian.org>
-on lundi 21 juillet 2008, 01:08:27 (UTC+0200)
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Apache Mina
+Maintainer: Apache Software Foundation, http://mina.apache.org/
+Source: http://www.apache.org/dist/mina/
 
-This package was downloaded from http://www.apache.org/dist/mina/
+Files: *
+Copyright: Copyright (C) 2007-2010 The Apache Software Foundation
+Copyright: Copyright (c) 2003 Eric Glass (NTLMResponses.java)
+License: Apache-2.0
 
-Upstream Author: Apache Software Foundation
+Files: debian/*
+Copyright: Copyright (C) 2008, Damien Raude-Morvan <drazzib at debian.org>
+Copyright: Copyright (C) 2008, Rail Aliev <rail at i-rs.ru>
+License: Apache-2.0
 
-Copyright:
-    Copyright (C) 2007-2009 The Apache Software Foundation
-    Copyright (c) 2003 Eric Glass (NTLMResponses.java)
-
-Note:
-  The upstream tarball of mina as been stripped to make a DFSG version.
-  Items removed from upstream :
-  - all packaged JAR
-  - non-free VSD files (MS Visio)
-  - non-free MD4 from MD4.java
-  - generated Javadoc and Xref
-  - LICENCE.*.txt from other projects
-
 License: Apache 2.0
-
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
-
-The Debian packaging is
-Copyright (C) 2008, Damien Raude-Morvan <drazzib at debian.org>
-Copyright (C) 2008, Rail Aliev <rail at i-rs.ru>
-and is licensed under the BSD, see `/usr/share/common-licenses/BSD'.

Modified: trunk/mina2/debian/orig-tar.sh
===================================================================
--- trunk/mina2/debian/orig-tar.sh	2010-10-02 11:46:11 UTC (rev 13011)
+++ trunk/mina2/debian/orig-tar.sh	2010-10-02 12:30:44 UTC (rev 13012)
@@ -14,7 +14,7 @@
 
 # clean up the upstream tarball
 tar zxf $3
-mv mina-* $DIR
+mv apache-mina-* $DIR
 GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR
 

Modified: trunk/mina2/debian/rules
===================================================================
--- trunk/mina2/debian/rules	2010-10-02 11:46:11 UTC (rev 13011)
+++ trunk/mina2/debian/rules	2010-10-02 12:30:44 UTC (rev 13012)
@@ -7,7 +7,8 @@
 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
+             /usr/share/tomcat6/lib/tomcat-coyote.jar \
+             RXTXcomm.jar
 DEB_ANT_BUILDFILE := debian/build.xml
 DEB_ANT_ARGS := -Ddeb.package=${DEB_SOURCE_PACKAGE}
 DEB_ANT_BUILD_TARGET := jar.all javadoc
@@ -16,7 +17,6 @@
 
 binary-post-install/libmina2-java::
 	mh_installpom -plibmina2-java -o src/pom.xml
-	mh_installpom -plibmina2-java src/mina-parent/pom.xml
 	for MYJAR in $(ALL_JARS); do \
 		BASENAME=`basename $$MYJAR .jar`; \
 		SUBPATH=`echo $$BASENAME | sed -e 's/mina2/mina/'`; \

Modified: trunk/mina2/debian/watch
===================================================================
--- trunk/mina2/debian/watch	2010-10-02 11:46:11 UTC (rev 13011)
+++ trunk/mina2/debian/watch	2010-10-02 12:30:44 UTC (rev 13012)
@@ -1,3 +1,3 @@
 version=3
-opts="dversionmangle=s/\+dfsg//,uversionmangle=s/-RC/~RC/;s/-M/~M/" \
-  http://www.apache.org/dist/mina/2.([\d.]+)-(.+)/mina-(.+)\.tar\.gz debian debian/orig-tar.sh
+opts="dversionmangle=s/\+dfsg//" \
+  http://www.apache.org/dist/mina/2\.([\d.]+)/ apache-mina-(.+)-src\.tar\.gz debian debian/orig-tar.sh


