This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository mina.
commit 947c8ecda4aea803d32e5ec45b1bea4b981ddffa Author: Damien Raude-Morvan <[email protected]> Date: Mon Oct 12 20:41:56 2009 +0000 * Append "Mina 1.x" in extended description * Bump debhelper to >= 7 * Maven POMs: - Add a Build-Depends-Indep dependency on maven-repo-helper - Use mh_installpom and mh_installjar to install the POM and the jar to the Maven repository - debian/maven.rules: Install all JAR with "1.x" currentVersion * Update debian/watch to track 1.x releases * Cleanup get-orig-source: - Create a debian/orig-tar.sh with exlusion list in debian/orig-tar.exclude --- debian/changelog | 15 +++++++++++++++ debian/compat | 2 +- debian/control | 8 +++++--- debian/libmina-java.jlibs | 5 ----- debian/maven.rules | 1 + debian/orig-tar.exclude | 8 ++++++++ debian/orig-tar.sh | 25 +++++++++++++++++++++++++ debian/rules | 27 ++++++++------------------- debian/watch | 2 +- 9 files changed, 64 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21babeb..7b69396 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +mina (1.1.7.dfsg-7) UNRELEASED; urgency=low + + * Append "Mina 1.x" in extended description + * Bump debhelper to >= 7 + * Maven POMs: + - Add a Build-Depends-Indep dependency on maven-repo-helper + - Use mh_installpom and mh_installjar to install the POM and the jar to the + Maven repository + - debian/maven.rules: Install all JAR with "1.x" currentVersion + * Update debian/watch to track 1.x releases + * Cleanup get-orig-source: + - Create a debian/orig-tar.sh with exlusion list in debian/orig-tar.exclude + + -- Damien Raude-Morvan <[email protected]> Mon, 12 Oct 2009 22:40:49 +0200 + mina (1.1.7.dfsg-6) unstable; urgency=low * Enable build of mina-integration-spring : diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 04baf42..e0aa8b3 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: java Priority: optional Maintainer: Debian Java maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 5), javahelper +Build-Depends: debhelper (>= 7), javahelper Build-Depends-Indep: openjdk-6-jdk, gjdoc, libslf4j-java, libjzlib-java, - libmx4j-java, libspring-beans-2.5-java + libmx4j-java, libspring-beans-2.5-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.3 @@ -32,6 +32,8 @@ Description: Java network application framework - Unit testability using mock objects - JMX managability - Stream-based I/O support via StreamIoHandler + . + This package contains Apache Mina 1.X release Package: libmina-java-doc Architecture: all @@ -54,4 +56,4 @@ Description: Java network application framework - documentation - JMX managability - Stream-based I/O support via StreamIoHandler . - This package contains Javadoc API for Apache Mina. + This package contains Javadoc API for Apache Mina 1.X release. diff --git a/debian/libmina-java.jlibs b/debian/libmina-java.jlibs deleted file mode 100644 index 158a422..0000000 --- a/debian/libmina-java.jlibs +++ /dev/null @@ -1,5 +0,0 @@ -mina-core.jar -mina-filter-compression.jar -mina-filter-ssl.jar -mina-integration-jmx.jar -mina-integration-spring.jar diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..8447216 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ +org.apache.mina * * s/1\..*/1.x/ diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude new file mode 100644 index 0000000..10ce00f --- /dev/null +++ b/debian/orig-tar.exclude @@ -0,0 +1,8 @@ +*.jar +*.vsd +docs/apidocs +docs/xref +docs/xref-test +LICENSE.jzlib.txt +LICENSE.slf4j.txt +LICENSE.springframework.txt diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..5163681 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,25 @@ +#!/bin/sh -e + +# 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 + +# $2 = version +# $3 = file +DIR=mina-$2.dfsg +TAR=mina_$2.dfsg.orig.tar.gz + +# clean up the upstream tarball +tar zxf $3 +mv mina-$2 $DIR +GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi diff --git a/debian/rules b/debian/rules index 40c64ff..e9cbfa5 100755 --- a/debian/rules +++ b/debian/rules @@ -34,6 +34,8 @@ 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 +ALL_JARS = $(wildcard *.jar) + build: build-arch-stamp build-indep-stamp build-arch: build-arch-stamp build-arch-stamp: @@ -78,8 +80,12 @@ binary-indep: build-indep install-indep 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):$(SPRING_SRC) - # use .jlibs file for linking JARS - jh_installlibs -i + for MYJAR in $(ALL_JARS); do \ + BASENAME=`basename $$MYJAR .jar`; \ + SUBPATH=`echo $$BASENAME | sed -e 's/mina\-//'`; \ + mh_installpom -plibmina-java -o $$SUBPATH/pom.xml ; \ + mh_installjar -plibmina-java -n$$BASENAME -l $$SUBPATH/pom.xml $$MYJAR ; \ + done dh_compress -i dh_fixperms -i dh_installdeb -i @@ -90,22 +96,5 @@ binary-indep: build-indep install-indep 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 index cf4ac43..9302592 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts=dversionmangle=s/\.dfsg// \ - http://www.apache.org/dist/mina/([\d.]+)/mina-([\d.]+)\.tar\.gz debian uupdate + http://www.apache.org/dist/mina/(1\.[\d.]+)/mina-(1\.[\d.]+)\.tar\.gz debian debian/orig-tar.sh -- 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
