[pkg-java] r12152 - trunk/mina/debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Tue Apr 13 18:20:21 UTC 2010
Author: drazzib
Date: 2010-04-13 18:20:20 +0000 (Tue, 13 Apr 2010)
New Revision: 12152
Removed:
trunk/mina/debian/libmina-java-doc.doc-base
Modified:
trunk/mina/debian/README.Debian
trunk/mina/debian/changelog
trunk/mina/debian/control
trunk/mina/debian/libmina-java-doc.javadoc
trunk/mina/debian/rules
Log:
* d/control: Remove gjdoc from Build-Depends.
* d/README.Debian: spring support is now enabled.
* d/rules: Use jh_installjavadoc to install javadoc
* d/rules: Use dh 7 style
* Switch to default-jdk
* Remove Depends on JRE (as allowed by new Java Policy)
Modified: trunk/mina/debian/README.Debian
===================================================================
--- trunk/mina/debian/README.Debian 2010-04-12 22:17:03 UTC (rev 12151)
+++ trunk/mina/debian/README.Debian 2010-04-13 18:20:20 UTC (rev 12152)
@@ -1,3 +1,2 @@
This package doesn't contain the following components:
-- integration-spring - requires Spring framework
- filter-codec-netty - requires netty2 which is obsolete
Modified: trunk/mina/debian/changelog
===================================================================
--- trunk/mina/debian/changelog 2010-04-12 22:17:03 UTC (rev 12151)
+++ trunk/mina/debian/changelog 2010-04-13 18:20:20 UTC (rev 12152)
@@ -1,3 +1,14 @@
+mina (1.1.7.dfsg-9) unstable; urgency=low
+
+ * d/control: Remove gjdoc from Build-Depends.
+ * d/README.Debian: spring support is now enabled.
+ * d/rules: Use jh_installjavadoc to install javadoc
+ * d/rules: Use dh 7 style
+ * Switch to default-jdk
+ * Remove Depends on JRE (as allowed by new Java Policy)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 13 Apr 2010 19:51:31 +0200
+
mina (1.1.7.dfsg-8) unstable; urgency=low
[ Damien Raude-Morvan ]
Modified: trunk/mina/debian/control
===================================================================
--- trunk/mina/debian/control 2010-04-12 22:17:03 UTC (rev 12151)
+++ trunk/mina/debian/control 2010-04-13 18:20:20 UTC (rev 12152)
@@ -3,8 +3,8 @@
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 (>= 7), javahelper
-Build-Depends-Indep: openjdk-6-jdk, gjdoc, libslf4j-java, libjzlib-java,
+Build-Depends: debhelper (>= 7.0.50~), javahelper (>= 0.25)
+Build-Depends-Indep: default-jdk, libslf4j-java, libjzlib-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
@@ -13,8 +13,7 @@
Package: libmina-java
Architecture: all
-Depends: openjdk-6-jre-headless | java5-runtime-headless, libslf4j-java,
- ${misc:Depends}
+Depends: libslf4j-java, ${misc:Depends}
Recommends: libjzlib-java, libmx4j-java
Suggests: libmina-java-doc, libspring-beans-2.5-java
Description: Java network application framework
Deleted: trunk/mina/debian/libmina-java-doc.doc-base
===================================================================
--- trunk/mina/debian/libmina-java-doc.doc-base 2010-04-12 22:17:03 UTC (rev 12151)
+++ trunk/mina/debian/libmina-java-doc.doc-base 2010-04-13 18:20:20 UTC (rev 12152)
@@ -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
Modified: trunk/mina/debian/libmina-java-doc.javadoc
===================================================================
--- trunk/mina/debian/libmina-java-doc.javadoc 2010-04-12 22:17:03 UTC (rev 12151)
+++ trunk/mina/debian/libmina-java-doc.javadoc 2010-04-13 18:20:20 UTC (rev 12152)
@@ -1,27 +1 @@
-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
+internal
Modified: trunk/mina/debian/rules
===================================================================
--- trunk/mina/debian/rules 2010-04-12 22:17:03 UTC (rev 12151)
+++ trunk/mina/debian/rules 2010-04-13 18:20:20 UTC (rev 12152)
@@ -6,8 +6,7 @@
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
+JAVA_HOME := /usr/lib/jvm/default-java
# We need to export JAVA_HOME for jh_build
export JAVA_HOME
@@ -36,65 +35,31 @@
ALL_JARS = $(wildcard *.jar)
-build: build-arch-stamp build-indep-stamp
-build-arch: build-arch-stamp
-build-arch-stamp:
- dh_testdir
- touch $@
+%:
+ dh $@ --with javahelper
-build-indep: build-indep-stamp
-build-indep-stamp:
- dh_testdir
+override_dh_auto_build:
# 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 $@
+ ( CLASSPATH=${CORE_CP} jh_build -J -o"$(JAVA_OPTS)" $(CORE_JAR) $(CORE_SRC) )
+ ( CLASSPATH=${ZLIB_CP} jh_build -J -o"$(JAVA_OPTS)" $(ZLIB_JAR) $(ZLIB_SRC) )
+ ( CLASSPATH=${SSL_CP} jh_build -J -o"$(JAVA_OPTS)" $(SSL_JAR) $(SSL_SRC) )
+ ( CLASSPATH=${JMX_CP} jh_build -J -o"$(JAVA_OPTS)" $(JMX_JAR) $(JMX_SRC) )
+ ( CLASSPATH=${SPRING_CP} jh_build -J -o"$(JAVA_OPTS)" $(SPRING_JAR) $(SPRING_SRC) )
-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)
+override_dh_auto_clean:
+ rm -f $(CORE_JAR) $(ZLIB_JAR) $(SSL_JAR) $(JMX_JAR) $(SPRING_JAR)
-install-indep: build-indep
- dh_testdir
- dh_testroot
- dh_prep
- 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_prep
- dh_install -i
- dh_installdocs -i
+override_dh_installexamples:
# 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)
+ dh_installexamples -plibmina-java-doc -i -X"META-INF" -X"LICENSE"
+
+override_dh_auto_install:
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
- 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
-
get-orig-source:
uscan --force-download --rename
More information about the pkg-java-commits
mailing list