This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mina.
commit 5519fb72b3fa5baa8ba5299be4f571e6577f120f Author: Damien Raude-Morvan <[email protected]> Date: Thu Mar 26 21:20:35 2009 +0000 [svn-inject] Applying Debian modifications to trunk --- debian/README.Debian | 3 ++ debian/TODO | 3 ++ debian/changelog | 49 ++++++++++++++++++ debian/compat | 1 + debian/control | 55 ++++++++++++++++++++ debian/copyright | 27 ++++++++++ debian/libmina-java-doc.doc-base | 9 ++++ debian/libmina-java-doc.examples | 2 + debian/libmina-java-doc.javadoc | 27 ++++++++++ debian/libmina-java.docs | 1 + debian/libmina-java.jlibs | 4 ++ debian/rules | 108 +++++++++++++++++++++++++++++++++++++++ debian/watch | 3 ++ 13 files changed, 292 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..33ab577 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,3 @@ +This package doesn't contain the following components: +- integration-spring - requires Spring framework +- filter-codec-netty - requires netty2 which is obsolete diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..a4905d9 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,3 @@ +* Package "integration-spring" when spring framework package will enter Debian (#426259) +* Run JUnit during package building +* Test package with multiple JDK diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..7375478 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,49 @@ +mina (1.1.7.dfsg-5) unstable; urgency=low + + * Add Build-Depends on gjdoc for dh_javadoc helper (Closes: #507203) + Thanks to James Westby <[email protected]>. + * Move examples (sample source code) to libmina-java-doc package + + -- Damien Raude-Morvan <[email protected]> Sat, 29 Nov 2008 21:05:49 +0100 + +mina (1.1.7.dfsg-4) unstable; urgency=low + + * debian/control: + - As stated by Debian Java Policy, add a Depends on + required JRE (version >=5 and headless). Use openjdk-6-jre-headless as + default alternative. + - Depends on debhelper ">= 5" instead of ">> 5" + - Reformat and correct typo in debian packages description + * debian/watch: correct dversionmangle to escape ".dfsg" from version number + * debian/rules: give to jh_build options '-source 1.5 -target 1.5' to compile + to 1.5 .class format (without that we get OpenJDK6 default class format + which is 1.6) + * debian/copyright: + - Add a note about items stripped from upstream tarball. + - Reformat debian packaging copyright + * Rewrite Abstract of Mina package's doc-base. + + -- Damien Raude-Morvan <[email protected]> Thu, 14 Aug 2008 01:16:52 +0200 + +mina (1.1.7.dfsg-3) unstable; urgency=low + + * Initial release. (Closes: #491626) + * debian/control: Use differents synopses for libmina-java and -doc + * debian/rules: + - Use dh_installexamples for installing sample code + - Strip *.vsd files from orig.tar.gz (Microsoft Visio documents) + * debian/copyright: Licence packaging to BSD licence + + -- Damien Raude-Morvan <[email protected]> Sat, 02 Aug 2008 01:16:12 +0200 + +mina (1.1.7.dfsg-2) unstable; urgency=low + + * Use dh_javadoc for generating Javadoc + + -- Damien Raude-Morvan <[email protected]> Tue, 22 Jul 2008 21:26:43 +0200 + +mina (1.1.7.dfsg-1) unstable; urgency=low + + * Thanks to Rail Aliev <[email protected]> for his packaging help + + -- Damien Raude-Morvan <[email protected]> Tue, 22 Jul 2008 20:30:20 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..240971d --- /dev/null +++ b/debian/control @@ -0,0 +1,55 @@ +Source: mina +Section: libs +Priority: optional +Maintainer: Damien Raude-Morvan <[email protected]> +Build-Depends: debhelper (>= 5), javahelper +Build-Depends-Indep: openjdk-6-jdk, gjdoc, libslf4j-java, libjzlib-java, libmx4j-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 +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 + Apache MINA is a network application framework which helps users develop high + performance and high scalability network applications easily. It provides an + abstract - event-driven - asynchronous API over various transports such as + TCP/IP and UDP/IP via Java NIO. + . + Some of the features of Apache Mina are: + - Unified API for various transport types: TCP/UDP/RS232/In-VM + - Filter interface as an extension point; similar to Servlet filters + - Low-level and high-level API + - Highly customizable thread model + - Out-of-the-box SSL / TLS and StartTLS support using Java 5 SSLEngine + - Overload shielding & traffic throttling + - Unit testability using mock objects + - JMX managability + - Stream-based I/O support via StreamIoHandler + +Package: libmina-java-doc +Architecture: all +Section: doc +Suggests: libmina-java +Description: Java network application framework - documentation + Apache MINA is a network application framework which helps users develop high + performance and high scalability network applications easily. It provides an + abstract - event-driven - asynchronous API over various transports such as + TCP/IP and UDP/IP via Java NIO. + . + Some of the features of Apache Mina are: + - Unified API for various transport types: TCP/UDP/RS232/In-VM + - Filter interface as an extension point; similar to Servlet filters + - Low-level and high-level API + - Highly customizable thread model + - Out-of-the-box SSL / TLS and StartTLS support using Java 5 SSLEngine + - Overload shielding & traffic throttling + - Unit testability using mock objects + - JMX managability + - Stream-based I/O support via StreamIoHandler + . + This package contains Javadoc API for Apache Mina. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..6e623e7 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +This package was Debianised by Damien Raude-Morvan <[email protected]> +on lundi 21 juillet 2008, 01:08:27 (UTC+0200) + +This package was downloaded from http://www.apache.org/dist/mina/ + +Upstream Author: Apache Software Foundation + +Copyright: + Copyright (C) 2007 The Apache Software Foundation + +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) + - 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 <[email protected]> +Copyright (C) 2008, Rail Aliev <[email protected]> +and is licensed under the BSD, see `/usr/share/common-licenses/BSD'. diff --git a/debian/libmina-java-doc.doc-base b/debian/libmina-java-doc.doc-base new file mode 100644 index 0000000..82623bc --- /dev/null +++ b/debian/libmina-java-doc.doc-base @@ -0,0 +1,9 @@ +Document: libmina-java-doc +Title: API JavaDoc for libmina-java +Author: Apache Software Foundation +Abstract: Javadocs programmer API of libmina-java-doc +Section: Programming + +Format: HTML +Index: /usr/share/doc/libmina-java-doc/api/index.html +Files: /usr/share/doc/libmina-java-doc/api/*.html diff --git a/debian/libmina-java-doc.examples b/debian/libmina-java-doc.examples new file mode 100644 index 0000000..22c3c87 --- /dev/null +++ b/debian/libmina-java-doc.examples @@ -0,0 +1,2 @@ +example/* + diff --git a/debian/libmina-java-doc.javadoc b/debian/libmina-java-doc.javadoc new file mode 100644 index 0000000..6e5f8e6 --- /dev/null +++ b/debian/libmina-java-doc.javadoc @@ -0,0 +1,27 @@ +org.apache.mina +org.apache.mina.common +org.apache.mina.common.support +org.apache.mina.filter +org.apache.mina.filter.executor +org.apache.mina.filter.codec +org.apache.mina.filter.codec.demux +org.apache.mina.filter.codec.support +org.apache.mina.filter.codec.textline +org.apache.mina.filter.codec.serialization +org.apache.mina.filter.support +org.apache.mina.integration +org.apache.mina.integration.jmx +org.apache.mina.handler +org.apache.mina.handler.chain +org.apache.mina.handler.multiton +org.apache.mina.handler.demux +org.apache.mina.handler.support +org.apache.mina.management +org.apache.mina.transport +org.apache.mina.transport.vmpipe +org.apache.mina.transport.vmpipe.support +org.apache.mina.transport.socket +org.apache.mina.transport.socket.bio +org.apache.mina.transport.socket.nio +org.apache.mina.transport.socket.nio.support +org.apache.mina.util diff --git a/debian/libmina-java.docs b/debian/libmina-java.docs new file mode 100644 index 0000000..d89f79f --- /dev/null +++ b/debian/libmina-java.docs @@ -0,0 +1 @@ +NOTICE.txt diff --git a/debian/libmina-java.jlibs b/debian/libmina-java.jlibs new file mode 100644 index 0000000..ccb5308 --- /dev/null +++ b/debian/libmina-java.jlibs @@ -0,0 +1,4 @@ +mina-core.jar +mina-filter-compression.jar +mina-filter-ssl.jar +mina-integration-jmx.jar diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a448105 --- /dev/null +++ b/debian/rules @@ -0,0 +1,108 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ') +VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed -r 's/\.dfsg//') + +# Use OpenJDK6 to compile Java 1.5 source files +JAVA_HOME := /usr/lib/jvm/java-6-openjdk +# We need to export JAVA_HOME for jh_build +export JAVA_HOME + +# Force compilation of 1.5 .class format +JAVA_OPTS := -source 1.5 -target 1.5 + +CORE_JAR := $(PACKAGE)-core.jar +CORE_SRC := core/src/main/java/ +CORE_CP := /usr/share/java/slf4j-api.jar + +ZLIB_JAR := $(PACKAGE)-filter-compression.jar +ZLIB_SRC := filter-compression/src/main/java/ +ZLIB_CP := $(CORE_JAR):/usr/share/java/slf4j-api.jar:/usr/share/java/jzlib.jar + +SSL_JAR := $(PACKAGE)-filter-ssl.jar +SSL_SRC := filter-ssl/src/main/java/ +SSL_CP := $(CORE_JAR):/usr/share/java/slf4j-api.jar + +JMX_JAR := $(PACKAGE)-integration-jmx.jar +JMX_SRC := integration-jmx/src/main/java/ +JMX_CP := $(CORE_JAR):/usr/share/java/slf4j-api.jar:/usr/share/java/mx4j.jar + +build: build-arch-stamp build-indep-stamp +build-arch: build-arch-stamp +build-arch-stamp: + dh_testdir + touch $@ + +build-indep: build-indep-stamp +build-indep-stamp: + dh_testdir + # Build the packages + ( CLASSPATH=${CORE_CP} jh_build -o"$(JAVA_OPTS)" $(CORE_JAR) $(CORE_SRC) ) + ( 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) ) + touch $@ + +clean: + dh_testdir + dh_testroot + jh_build --clean + dh_clean + rm -f build-arch-stamp build-indep-stamp $(CORE_JAR) $(ZLIB_JAR) $(SSL_JAR) $(JMX_JAR) + +install-indep: build-indep + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + +binary-arch: build-arch + # Java packages are arch: all, nothing to do here + +binary-indep: build-indep install-indep + dh_testdir + dh_testroot + dh_clean -k + dh_install -i + dh_installdocs -i + # Don't include META-INF or LICENSE files from examples + 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) + # use .jlibs file for linking JARS + jh_installlibs -i + # replace {java:Depends} + jh_depends -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary: binary-indep binary-arch +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep + +# Make a DFSG version of upstream tarball +# - remove all packaged JAR +# - remove non-free VSD files (MS Visio) +# - remove generated Javadoc and Xref +# - remove LICENCE.*.txt from other projects +get-orig-source: + uscan --force-download --rename + mkdir orig_tmp + (cd orig_tmp && \ + tar -xzf ../../mina_${VERSION}.orig.tar.gz && \ + find mina-${VERSION} -iname *.jar -delete && \ + find mina-${VERSION} -iname *.vsd -delete && \ + rm -rf mina-${VERSION}/docs/apidocs mina-${VERSION}/docs/xref mina-${VERSION}/docs/xref-test && \ + rm mina-${VERSION}/LICENSE.jzlib.txt mina-${VERSION}/LICENSE.slf4j.txt mina-${VERSION}/LICENSE.springframework.txt && \ + mv mina-${VERSION} mina-${VERSION}.dfsg && \ + tar -czf ../../mina_${VERSION}.dfsg.orig.tar.gz mina-${VERSION}.dfsg) + rm -rf orig_tmp + + diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..cf4ac43 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/\.dfsg// \ + http://www.apache.org/dist/mina/([\d.]+)/mina-([\d.]+)\.tar\.gz debian uupdate -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mina.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
