[pkg-java] r8133 - trunk/mina/debian

[drazzib-guest at alioth.debian.org]

Author: drazzib-guest
Date: 2009-03-26 21:26:54 +0000 (Thu, 26 Mar 2009)
New Revision: 8133

Modified:
   trunk/mina/debian/TODO
   trunk/mina/debian/changelog
   trunk/mina/debian/control
   trunk/mina/debian/libmina-java.jlibs
   trunk/mina/debian/rules
Log:
  * Enable build of mina-integration-spring :
   - debian/control: add B-D on libspring-beans to build mina-integration-spring
   - debian/libmina-java.jlibs: add new mina-integration-spring.jar
   - debian/rules: add rules tu build mina-integration-spring
  * Bump Standards-Version 3.8.1 (no changes needed)
  * Move libcommons-jci-java-* to "java" section



Modified: trunk/mina/debian/TODO
===================================================================
--- trunk/mina/debian/TODO	2009-03-26 21:22:31 UTC (rev 8132)
+++ trunk/mina/debian/TODO	2009-03-26 21:26:54 UTC (rev 8133)
@@ -1,3 +1 @@
-* Package "integration-spring" when spring framework package will enter Debian (#426259)
 * Run JUnit during package building
-* Test package with multiple JDK

Modified: trunk/mina/debian/changelog
===================================================================
--- trunk/mina/debian/changelog	2009-03-26 21:22:31 UTC (rev 8132)
+++ trunk/mina/debian/changelog	2009-03-26 21:26:54 UTC (rev 8133)
@@ -1,3 +1,14 @@
+mina (1.1.7.dfsg-6) UNRELEASED; urgency=low
+
+  * Enable build of mina-integration-spring :
+   - debian/control: add B-D on libspring-beans to build mina-integration-spring
+   - debian/libmina-java.jlibs: add new mina-integration-spring.jar
+   - debian/rules: add rules tu build mina-integration-spring
+  * Bump Standards-Version 3.8.1 (no changes needed)
+  * Move libcommons-jci-java-* to "java" section
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 26 Mar 2009 22:25:50 +0100
+
 mina (1.1.7.dfsg-5) unstable; urgency=low
 
   * Add Build-Depends on gjdoc for dh_javadoc helper (Closes: #507203)

Modified: trunk/mina/debian/control
===================================================================
--- trunk/mina/debian/control	2009-03-26 21:22:31 UTC (rev 8132)
+++ trunk/mina/debian/control	2009-03-26 21:26:54 UTC (rev 8133)
@@ -1,17 +1,17 @@
 Source: mina
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Damien Raude-Morvan <drazzib at drazzib.com>
 Build-Depends: debhelper (>= 5), javahelper
-Build-Depends-Indep: openjdk-6-jdk, gjdoc, libslf4j-java, libjzlib-java, libmx4j-java
+Build-Depends-Indep: openjdk-6-jdk, gjdoc, libslf4j-java, libjzlib-java,
+  libmx4j-java, libspring-beans-2.5-java
 Vcs-Svn: http://svn.drazzib.com/debian-pkg/mina/trunk
 Vcs-Browser: http://svn.drazzib.com/wsvn/Debian-Pkg/mina/trunk
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://mina.apache.org
 
 Package: libmina-java
 Architecture: all
-Section: libs
 Depends: openjdk-6-jre-headless | java5-runtime-headless, ${java:Depends}
 Suggests: libmina-java-doc
 Description: Java network application framework

Modified: trunk/mina/debian/libmina-java.jlibs
===================================================================
--- trunk/mina/debian/libmina-java.jlibs	2009-03-26 21:22:31 UTC (rev 8132)
+++ trunk/mina/debian/libmina-java.jlibs	2009-03-26 21:26:54 UTC (rev 8133)
@@ -2,3 +2,4 @@
 mina-filter-compression.jar
 mina-filter-ssl.jar
 mina-integration-jmx.jar
+mina-integration-spring.jar

Modified: trunk/mina/debian/rules
===================================================================
--- trunk/mina/debian/rules	2009-03-26 21:22:31 UTC (rev 8132)
+++ trunk/mina/debian/rules	2009-03-26 21:26:54 UTC (rev 8133)
@@ -30,6 +30,10 @@
 JMX_SRC   := integration-jmx/src/main/java/
 JMX_CP    := $(CORE_JAR):/usr/share/java/slf4j-api.jar:/usr/share/java/mx4j.jar
 
+SPRING_JAR := $(PACKAGE)-integration-spring.jar
+SPRING_SRC := integration-spring/src/main/java/
+SPRING_CP  := $(CORE_JAR):/usr/share/java/slf4j-api.jar:/usr/share/java/spring-core.jar:/usr/share/java/spring-beans.jar
+
 build: build-arch-stamp build-indep-stamp
 build-arch: build-arch-stamp
 build-arch-stamp:
@@ -44,6 +48,7 @@
 	( CLASSPATH=${ZLIB_CP} jh_build -o"$(JAVA_OPTS)" $(ZLIB_JAR) $(ZLIB_SRC) )
 	( CLASSPATH=${SSL_CP} jh_build -o"$(JAVA_OPTS)" $(SSL_JAR) $(SSL_SRC) )
 	( CLASSPATH=${JMX_CP} jh_build -o"$(JAVA_OPTS)" $(JMX_JAR) $(JMX_SRC) )
+	( CLASSPATH=${SPRING_CP} jh_build -o"$(JAVA_OPTS)" $(SPRING_JAR) $(SPRING_SRC) )
 	touch $@
 
 clean:
@@ -51,7 +56,7 @@
 	dh_testroot
 	jh_build --clean
 	dh_clean
-	rm -f build-arch-stamp build-indep-stamp $(CORE_JAR) $(ZLIB_JAR) $(SSL_JAR) $(JMX_JAR)
+	rm -f build-arch-stamp build-indep-stamp $(CORE_JAR) $(ZLIB_JAR) $(SSL_JAR) $(JMX_JAR) $(SPRING_JAR)
 
 install-indep: build-indep
 	dh_testdir
@@ -72,7 +77,7 @@
 	dh_installexamples -i -X"META-INF" -X"LICENSE"
 	dh_installchangelogs -i
 	# Use dh_javadoc for building libmina-java-doc
-	dh_javadoc -Nlibmina-java -plibmina-java-doc -i --sourcedir=$(CORE_SRC):$(ZLIB_SRC):$(SSL_SRC):$(JMX_SRC)
+	dh_javadoc -Nlibmina-java -plibmina-java-doc -i --sourcedir=$(CORE_SRC):$(ZLIB_SRC):$(SSL_SRC):$(JMX_SRC):$(SPRING_SRC)
 	# use .jlibs file for linking JARS
 	jh_installlibs -i
 	# replace {java:Depends}