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

Damien Raude-Morvan drazzib at alioth.debian.org
Sun Oct 11 23:25:52 UTC 2009 

Author: drazzib
Date: 2009-10-11 23:25:52 +0000 (Sun, 11 Oct 2009)
New Revision: 10805

Added:
   trunk/mina2/debian/ant.properties
   trunk/mina2/debian/build.xml
   trunk/mina2/debian/libmina2-java-doc.doc-base
   trunk/mina2/debian/libmina2-java-doc.examples
   trunk/mina2/debian/libmina2-java.docs
   trunk/mina2/debian/maven.rules
   trunk/mina2/debian/orig-tar.exclude
   trunk/mina2/debian/orig-tar.sh
Removed:
   trunk/mina2/debian/TODO
   trunk/mina2/debian/libmina-java-doc.doc-base
   trunk/mina2/debian/libmina-java-doc.examples
   trunk/mina2/debian/libmina-java-doc.javadoc
   trunk/mina2/debian/libmina-java.docs
   trunk/mina2/debian/libmina-java.jlibs
Modified:
   trunk/mina2/debian/README.Debian
   trunk/mina2/debian/changelog
   trunk/mina2/debian/compat
   trunk/mina2/debian/control
   trunk/mina2/debian/copyright
   trunk/mina2/debian/rules
   trunk/mina2/debian/watch
Log:
* New upstream release (unstable).
  - Copy "mina" package to "mina2"
  - Build-Depends on libtomcat6-java and libognl-java
* Switch from javahelper to cdbs:
  - Remove javahelper from Build-Depends
  - Build-Depends on ant and cdbs
  - Use debian/build.xml and debian/ant.properties
* 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
* Update debian/watch to track 2.x releases
* Update debian/copyright:
  - Copyrights years
  - New note about removal of MD4.java/MD4Provider.java (unclear license)
* Cleanup get-orig-source:
  - Create a debian/orig-tar.sh with exlusion list in debian/orig-tar.exclude

Modified: trunk/mina2/debian/README.Debian
===================================================================
--- trunk/mina2/debian/README.Debian	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/README.Debian	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,3 +1,3 @@
 This package doesn't contain the following components:
-- integration-spring - requires Spring framework
 - filter-codec-netty - requires netty2 which is obsolete
+- transport-serial - require rxtx (gnu.io) not yet in Debian

Deleted: trunk/mina2/debian/TODO
===================================================================
--- trunk/mina2/debian/TODO	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/TODO	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1 +0,0 @@
-* Run JUnit during package building

Added: trunk/mina2/debian/ant.properties
===================================================================
--- trunk/mina2/debian/ant.properties	                        (rev 0)
+++ trunk/mina2/debian/ant.properties	2009-10-11 23:25:52 UTC (rev 10805)
@@ -0,0 +1,3 @@
+build.dir=build
+dist.dir=dist
+src.dir=src

Added: trunk/mina2/debian/build.xml
===================================================================
--- trunk/mina2/debian/build.xml	                        (rev 0)
+++ trunk/mina2/debian/build.xml	2009-10-11 23:25:52 UTC (rev 10805)
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<project name="mina" basedir="..">
+
+<!--
+GENERICS TARGETS
+-->
+<target name="-compile">
+	<mkdir dir="${build.dir}/${component}"/>
+	<javac srcdir="${src.dir}/mina-${component}/src/main"
+			destdir="${build.dir}/${component}"
+			classpath="${classpath}"
+			source="1.5" target="1.5"
+			debug="on">
+	</javac>
+</target>
+
+<target name="-jar">
+	<jar jarfile="${dist.dir}/${deb.package}-${component}.jar"
+			basedir="${build.dir}/${component}" />
+</target>
+
+<!--
+REAL TARGETS
+-->
+<target name="compile.all">
+	<antcall target="-compile">
+		<param name="component" value="core"/>
+		<param name="classpath" value=""/>
+	</antcall>
+	
+	<antcall target="-compile">
+		<param name="component" value="filter-compression"/>
+		<param name="classpath" value="${build.dir}/core"/>
+	</antcall>
+	
+	<antcall target="-compile">
+		<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="integration-xbean"/>
+		<param name="classpath" value="${build.dir}/core:${build.dir}/integration-beans"/>
+	</antcall>
+	
+	<antcall target="-compile">
+		<param name="component" value="integration-ognl"/>
+		<param name="classpath" value="${build.dir}/core:${build.dir}/integration-beans"/>
+	</antcall>
+	
+	<antcall target="-compile">
+		<param name="component" value="integration-jmx"/>
+		<param name="classpath" value="${build.dir}/core:${build.dir}/integration-beans:${build.dir}/integration-ognl"/>
+	</antcall>
+</target>
+
+<target name="jar.all" depends="compile.all">
+	<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="integration-xbean"/></antcall>
+	<antcall target="-jar"><param name="component" value="integration-ognl"/></antcall>
+	<antcall target="-jar"><param name="component" value="integration-jmx"/></antcall>
+</target>
+
+<target name="javadoc">
+
+	<javadoc
+		packagenames="*"
+		destdir="${dist.dir}/api"
+		access="protected"
+		old="false"
+		verbose="false"
+		version="true"
+		use="true"
+		author="true"
+		>
+		<fileset dir=".">
+			<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-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"/>
+			<include name="${src.dir}/mina-integration-jmx/src/main/**/*.java"/>
+		</fileset>
+	</javadoc>
+
+</target>
+
+
+
+<target name="clean">
+	<delete dir="${build.dir}"/>
+	<delete dir="${dist.dir}"/>
+
+	<mkdir dir="${build.dir}"/>
+	<mkdir dir="${dist.dir}"/>
+</target>
+
+
+
+</project>

Modified: trunk/mina2/debian/changelog
===================================================================
--- trunk/mina2/debian/changelog	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/changelog	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,3 +1,26 @@
+mina2 (2.0.0~M6+dfsg-1) unstable; urgency=low
+
+  * New upstream release (unstable).
+    - Copy "mina" package to "mina2"
+    - Build-Depends on libtomcat6-java and libognl-java
+  * Switch from javahelper to cdbs:
+    - Remove javahelper from Build-Depends
+    - Build-Depends on ant and cdbs
+    - Use debian/build.xml and debian/ant.properties
+  * 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
+  * Update debian/watch to track 2.x releases
+  * Update debian/copyright:
+    - Copyrights years
+    - New note about removal of MD4.java/MD4Provider.java (unclear license)
+  * Cleanup get-orig-source:
+    - Create a debian/orig-tar.sh with exlusion list in debian/orig-tar.exclude
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 12 Oct 2009 01:23:39 +0200
+
 mina (1.1.7.dfsg-6) unstable; urgency=low
 
   * Enable build of mina-integration-spring :

Modified: trunk/mina2/debian/compat
===================================================================
--- trunk/mina2/debian/compat	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/compat	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1 +1 @@
-5
+7

Modified: trunk/mina2/debian/control
===================================================================
--- trunk/mina2/debian/control	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/control	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,20 +1,21 @@
-Source: mina
+Source: mina2
 Section: java
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 5), javahelper
-Build-Depends-Indep: openjdk-6-jdk, gjdoc, libslf4j-java, libjzlib-java,
-  libmx4j-java, libspring-beans-2.5-java
+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,
+  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
 Homepage: http://mina.apache.org
 
-Package: libmina-java
+Package: libmina2-java
 Architecture: all
-Depends: openjdk-6-jre-headless | java5-runtime-headless, libslf4j-java
-Recommends: libjzlib-java, libmx4j-java
+Depends: ${misc:Depends}, openjdk-6-jre-headless | java5-runtime-headless, 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
  Apache MINA is a network application framework which helps users develop high
@@ -33,9 +34,10 @@
   - JMX managability
   - Stream-based I/O support via StreamIoHandler
 
-Package: libmina-java-doc
+Package: libmina2-java-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}
 Suggests: libmina-java
 Description: Java network application framework - documentation
  Apache MINA is a network application framework which helps users develop high

Modified: trunk/mina2/debian/copyright
===================================================================
--- trunk/mina2/debian/copyright	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/copyright	2009-10-11 23:25:52 UTC (rev 10805)
@@ -6,13 +6,14 @@
 Upstream Author: Apache Software Foundation
 
 Copyright:
-    Copyright (C) 2007 The Apache Software Foundation
+    Copyright (C) 2007-2009 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)
+  - non-free MD4 from MD4.java
   - generated Javadoc and Xref
   - LICENCE.*.txt from other projects
 

Deleted: trunk/mina2/debian/libmina-java-doc.doc-base
===================================================================
--- trunk/mina2/debian/libmina-java-doc.doc-base	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/libmina-java-doc.doc-base	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,9 +0,0 @@
-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

Deleted: trunk/mina2/debian/libmina-java-doc.examples
===================================================================
--- trunk/mina2/debian/libmina-java-doc.examples	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/libmina-java-doc.examples	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,2 +0,0 @@
-example/*
-

Deleted: trunk/mina2/debian/libmina-java-doc.javadoc
===================================================================
--- trunk/mina2/debian/libmina-java-doc.javadoc	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/libmina-java-doc.javadoc	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,27 +0,0 @@
-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

Deleted: trunk/mina2/debian/libmina-java.docs
===================================================================
--- trunk/mina2/debian/libmina-java.docs	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/libmina-java.docs	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1 +0,0 @@
-NOTICE.txt

Deleted: trunk/mina2/debian/libmina-java.jlibs
===================================================================
--- trunk/mina2/debian/libmina-java.jlibs	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/libmina-java.jlibs	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,5 +0,0 @@
-mina-core.jar
-mina-filter-compression.jar
-mina-filter-ssl.jar
-mina-integration-jmx.jar
-mina-integration-spring.jar

Copied: trunk/mina2/debian/libmina2-java-doc.doc-base (from rev 8195, trunk/mina/debian/libmina-java-doc.doc-base)
===================================================================
--- trunk/mina2/debian/libmina2-java-doc.doc-base	                        (rev 0)
+++ trunk/mina2/debian/libmina2-java-doc.doc-base	2009-10-11 23:25:52 UTC (rev 10805)
@@ -0,0 +1,9 @@
+Document: libmina2-java-doc
+Title: API JavaDoc for libmina2-java
+Author: Apache Software Foundation
+Abstract: Javadocs programmer API of libmina2-java-doc
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmina2-java/api/index.html
+Files: /usr/share/doc/libmina2-java/api/*.html

Copied: trunk/mina2/debian/libmina2-java-doc.examples (from rev 8195, trunk/mina/debian/libmina-java-doc.examples)
===================================================================
--- trunk/mina2/debian/libmina2-java-doc.examples	                        (rev 0)
+++ trunk/mina2/debian/libmina2-java-doc.examples	2009-10-11 23:25:52 UTC (rev 10805)
@@ -0,0 +1,2 @@
+src/mina-example/*
+

Copied: trunk/mina2/debian/libmina2-java.docs (from rev 8195, trunk/mina/debian/libmina-java.docs)
===================================================================
--- trunk/mina2/debian/libmina2-java.docs	                        (rev 0)
+++ trunk/mina2/debian/libmina2-java.docs	2009-10-11 23:25:52 UTC (rev 10805)
@@ -0,0 +1 @@
+NOTICE.txt

Added: trunk/mina2/debian/orig-tar.exclude
===================================================================
--- trunk/mina2/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/mina2/debian/orig-tar.exclude	2009-10-11 23:25:52 UTC (rev 10805)
@@ -0,0 +1,6 @@
+*.jar
+*.vsd
+docs/*
+LICENSE.*.txt
+src/mina-core/src/main/java/org/apache/mina/proxy/utils/MD4.java
+src/mina-core/src/main/java/org/apache/mina/proxy/utils/MD4Provider.java

Added: trunk/mina2/debian/orig-tar.sh
===================================================================
--- trunk/mina2/debian/orig-tar.sh	                        (rev 0)
+++ trunk/mina2/debian/orig-tar.sh	2009-10-11 23:25:52 UTC (rev 10805)
@@ -0,0 +1,26 @@
+#!/bin/sh -e
+
+# Make a DFSG version of upstream tarball
+# - remove all packaged JAR
+# - remove non-free VSD files (MS Visio)
+# - remove non-free MD4 in MD4.java
+# - remove generated Javadoc and Xref
+# - remove LICENCE.*.txt from other projects
+
+# $2 = version
+# $3 = file
+DIR=mina2-$2.orig
+TAR=mina2_$2+dfsg.orig.tar.gz
+
+# clean up the upstream tarball
+tar zxf $3
+mv mina-* $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/mina2/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/mina2/debian/rules
===================================================================
--- trunk/mina2/debian/rules	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/rules	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,111 +1,31 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-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
+DEB_JARS  := slf4j-api jzlib mx4j spring-core spring-beans ognl \
+             /usr/share/tomcat6/lib/tomcat-coyote.jar
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Ddeb.package=${DEB_SOURCE_PACKAGE}
+DEB_ANT_BUILD_TARGET := jar.all javadoc
 
-CORE_JAR  := $(PACKAGE)-core.jar
-CORE_SRC  := core/src/main/java/
-CORE_CP   := /usr/share/java/slf4j-api.jar
+ALL_JARS = $(wildcard dist/*.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
+binary-post-install/libmina2-java::
+	for jar in $(ALL_JARS); do \
+		BASENAME=`basename $$jar .jar`; \
+		t=`echo $$BASENAME | sed -e 's/mina2/mina/'`; \
+		mh_installpom -plibmina2-java -o src/$$t/pom.xml ; \
+		mh_installjar -plibmina2-java -n$$BASENAME -l src/$$t/pom.xml $$jar ; \
+	done
 
-SSL_JAR   := $(PACKAGE)-filter-ssl.jar
-SSL_SRC   := filter-ssl/src/main/java/
-SSL_CP    := $(CORE_JAR):/usr/share/java/slf4j-api.jar
+binary-post-install/libmina2-java-doc::
+	dh_install -plibmina2-java-doc dist/api /usr/share/doc/libmina2-java
 
-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
-
-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:
-	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) )
-	( CLASSPATH=${SPRING_CP} jh_build -o"$(JAVA_OPTS)" $(SPRING_JAR) $(SPRING_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) $(SPRING_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):$(SPRING_SRC)
-	# use .jlibs file for linking JARS
-	jh_installlibs -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
 
 

Modified: trunk/mina2/debian/watch
===================================================================
--- trunk/mina2/debian/watch	2009-10-11 22:46:55 UTC (rev 10804)
+++ trunk/mina2/debian/watch	2009-10-11 23:25:52 UTC (rev 10805)
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\.dfsg// \
-  http://www.apache.org/dist/mina/([\d.]+)/mina-([\d.]+)\.tar\.gz debian uupdate
+opts="dversionmangle=s/\+dfsg//,uversionmangle=s/([\d.]+)-M([\d.]+)/$1~M$2/" \
+  http://www.apache.org/dist/mina/2.([\d.]+)-(.+)/mina-(.+)\.tar\.gz debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list