Author: drazzib
Date: 2009-10-12 20:41:56 +0000 (Mon, 12 Oct 2009)
New Revision: 10808
Added:
trunk/mina/debian/maven.rules
trunk/mina/debian/orig-tar.exclude
trunk/mina/debian/orig-tar.sh
Removed:
trunk/mina/debian/libmina-java.jlibs
Modified:
trunk/mina/debian/changelog
trunk/mina/debian/compat
trunk/mina/debian/control
trunk/mina/debian/rules
trunk/mina/debian/watch
Log:
* 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
Modified: trunk/mina/debian/changelog
===================================================================
--- trunk/mina/debian/changelog 2009-10-12 18:03:09 UTC (rev 10807)
+++ trunk/mina/debian/changelog 2009-10-12 20:41:56 UTC (rev 10808)
@@ -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 :
Modified: trunk/mina/debian/compat
===================================================================
--- trunk/mina/debian/compat 2009-10-12 18:03:09 UTC (rev 10807)
+++ trunk/mina/debian/compat 2009-10-12 20:41:56 UTC (rev 10808)
@@ -1 +1 @@
-5
+7
Modified: trunk/mina/debian/control
===================================================================
--- trunk/mina/debian/control 2009-10-12 18:03:09 UTC (rev 10807)
+++ trunk/mina/debian/control 2009-10-12 20:41:56 UTC (rev 10808)
@@ -3,9 +3,9 @@
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 @@
- 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 @@
- 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.
Deleted: trunk/mina/debian/libmina-java.jlibs
===================================================================
--- trunk/mina/debian/libmina-java.jlibs 2009-10-12 18:03:09 UTC (rev
10807)
+++ trunk/mina/debian/libmina-java.jlibs 2009-10-12 20:41:56 UTC (rev
10808)
@@ -1,5 +0,0 @@
-mina-core.jar
-mina-filter-compression.jar
-mina-filter-ssl.jar
-mina-integration-jmx.jar
-mina-integration-spring.jar
Added: trunk/mina/debian/maven.rules
===================================================================
--- trunk/mina/debian/maven.rules (rev 0)
+++ trunk/mina/debian/maven.rules 2009-10-12 20:41:56 UTC (rev 10808)
@@ -0,0 +1 @@
+org.apache.mina * * s/1\..*/1.x/
Added: trunk/mina/debian/orig-tar.exclude
===================================================================
--- trunk/mina/debian/orig-tar.exclude (rev 0)
+++ trunk/mina/debian/orig-tar.exclude 2009-10-12 20:41:56 UTC (rev 10808)
@@ -0,0 +1,8 @@
+*.jar
+*.vsd
+docs/apidocs
+docs/xref
+docs/xref-test
+LICENSE.jzlib.txt
+LICENSE.slf4j.txt
+LICENSE.springframework.txt
Added: trunk/mina/debian/orig-tar.sh
===================================================================
--- trunk/mina/debian/orig-tar.sh (rev 0)
+++ trunk/mina/debian/orig-tar.sh 2009-10-12 20:41:56 UTC (rev 10808)
@@ -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
Property changes on: trunk/mina/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/mina/debian/rules
===================================================================
--- trunk/mina/debian/rules 2009-10-12 18:03:09 UTC (rev 10807)
+++ trunk/mina/debian/rules 2009-10-12 20:41:56 UTC (rev 10808)
@@ -34,6 +34,8 @@
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 @@
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: 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
-
-
Modified: trunk/mina/debian/watch
===================================================================
--- trunk/mina/debian/watch 2009-10-12 18:03:09 UTC (rev 10807)
+++ trunk/mina/debian/watch 2009-10-12 20:41:56 UTC (rev 10808)
@@ -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
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
