r2304 - in trunk/libcommons-net-java/debian: . patches

Arnaud Vandyck avdyk at costa.debian.org
Tue Aug 1 10:03:20 UTC 2006 

Author: avdyk
Date: 2006-08-01 10:03:19 +0000 (Tue, 01 Aug 2006)
New Revision: 2304

Added:
   trunk/libcommons-net-java/debian/doc-base
   trunk/libcommons-net-java/debian/patches/
   trunk/libcommons-net-java/debian/patches/01_build_xml_fork_to_compile_tests.patch
   trunk/libcommons-net-java/debian/patches/02_build_xml_dont_build_tests.patch
Modified:
   trunk/libcommons-net-java/debian/changelog
   trunk/libcommons-net-java/debian/control
   trunk/libcommons-net-java/debian/docs
   trunk/libcommons-net-java/debian/rules
   trunk/libcommons-net-java/debian/watch
Log:
libcommons-net-java (1.4.1-1) unstable; urgency=low

  * New upstram (closes: #377064)
  * debian/watch: updated to official Apache web site (not a mirror)
  * Updated Standards-Version to 3.7.2; split Build-Dep and
    Build-Dep-Indep
  * Built with java-gcj-compat-dev and cdbs-ant
  * debian/doc-base: added (based on Wolfgang's libcommons-logging-java
    debian/doc-base file)

 -- Arnaud Vandyck <avdyk at debian.org>  Tue,  1 Aug 2006 12:01:53 +0200

Modified: trunk/libcommons-net-java/debian/changelog
===================================================================
--- trunk/libcommons-net-java/debian/changelog	2006-08-01 09:08:56 UTC (rev 2303)
+++ trunk/libcommons-net-java/debian/changelog	2006-08-01 10:03:19 UTC (rev 2304)
@@ -1,3 +1,15 @@
+libcommons-net-java (1.4.1-1) unstable; urgency=low
+
+  * New upstram (closes: #377064)
+  * debian/watch: updated to official Apache web site (not a mirror)
+  * Updated Standards-Version to 3.7.2; split Build-Dep and
+    Build-Dep-Indep
+  * Built with java-gcj-compat-dev and cdbs-ant
+  * debian/doc-base: added (based on Wolfgang's libcommons-logging-java
+    debian/doc-base file)
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Tue,  1 Aug 2006 12:01:53 +0200
+
 libcommons-net-java (1.3.0-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libcommons-net-java/debian/control
===================================================================
--- trunk/libcommons-net-java/debian/control	2006-08-01 09:08:56 UTC (rev 2303)
+++ trunk/libcommons-net-java/debian/control	2006-08-01 10:03:19 UTC (rev 2304)
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, jikes-classpath, fastjar, gjdoc (>= 0.7.1), liboro-java (>=2.0.8), junit
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>> 4.0.0), cdbs
+Build-Depends-Indep: java-gcj-compat-dev, ant, liboro-java (>=2.0.8), junit
+Standards-Version: 3.7.2
 
 Package: libcommons-net-java
 Architecture: all
-Depends: sablevm | gij | kaffe (>= 2:1.1.4) | java1-runtime | java2-runtime, liboro-java (>= 2.0.8)
+Depends: java-gcj-compat | sablevm | gij | kaffe (>= 2:1.1.4) | java1-runtime | java2-runtime, liboro-java (>= 2.0.8)
 Description: internet protocol suite Java library
  This is an Internet protocol suite Java library originally developed by
  ORO, Inc. This version supports Finger, Whois, TFTP, Telnet, POP3, FTP,

Added: trunk/libcommons-net-java/debian/doc-base
===================================================================
--- trunk/libcommons-net-java/debian/doc-base	2006-08-01 09:08:56 UTC (rev 2303)
+++ trunk/libcommons-net-java/debian/doc-base	2006-08-01 10:03:19 UTC (rev 2304)
@@ -0,0 +1,10 @@
+Document: libcommons-net-java
+Title: Programmer API for Commons Net
+Author: Apache Commons Net developers
+Abstract: Jakarta Commons Net implements the client side of many basic
+ Internet protocols.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-net-java/api/index.html
+Files: /usr/share/doc/libcommons-net-java/api/*

Modified: trunk/libcommons-net-java/debian/docs
===================================================================
--- trunk/libcommons-net-java/debian/docs	2006-08-01 09:08:56 UTC (rev 2303)
+++ trunk/libcommons-net-java/debian/docs	2006-08-01 10:03:19 UTC (rev 2304)
@@ -1,3 +1,3 @@
 NOTICE.txt
-docs/*
+dist/docs/*
 

Added: trunk/libcommons-net-java/debian/patches/01_build_xml_fork_to_compile_tests.patch
===================================================================
--- trunk/libcommons-net-java/debian/patches/01_build_xml_fork_to_compile_tests.patch	2006-08-01 09:08:56 UTC (rev 2303)
+++ trunk/libcommons-net-java/debian/patches/01_build_xml_fork_to_compile_tests.patch	2006-08-01 10:03:19 UTC (rev 2304)
@@ -0,0 +1,12 @@
+--- build.xml~	2005-12-03 16:05:48.000000000 +0000
++++ build.xml	2006-08-01 09:45:03.000000000 +0000
+@@ -123,7 +123,8 @@
+   <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
+     <mkdir dir="${testclassesdir}">
+     </mkdir>
+-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
++    <javac destdir="${testclassesdir}" deprecation="true" debug="true"
++	    optimize="false" excludes="**/package.html" fork="true">
+       <src>
+         <pathelement location="src/test">
+         </pathelement>

Added: trunk/libcommons-net-java/debian/patches/02_build_xml_dont_build_tests.patch
===================================================================
--- trunk/libcommons-net-java/debian/patches/02_build_xml_dont_build_tests.patch	2006-08-01 09:08:56 UTC (rev 2303)
+++ trunk/libcommons-net-java/debian/patches/02_build_xml_dont_build_tests.patch	2006-08-01 10:03:19 UTC (rev 2304)
@@ -0,0 +1,11 @@
+--- build.xml~	2006-08-01 09:47:53.000000000 +0000
++++ build.xml	2006-08-01 09:50:13.000000000 +0000
+@@ -58,7 +58,7 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
++  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar">
+ 	    <fileset dir="${classesdir}">
+ 		    <exclude name="**/examples/**"/>

Modified: trunk/libcommons-net-java/debian/rules
===================================================================
--- trunk/libcommons-net-java/debian/rules	2006-08-01 09:08:56 UTC (rev 2303)
+++ trunk/libcommons-net-java/debian/rules	2006-08-01 10:03:19 UTC (rev 2304)
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# debian/rules for libcommons-discovery-java
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -8,32 +7,19 @@
 #export DH_COMPAT=4
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS := oro junit
+DEB_ANT_BUILD_TARGET := dist
 LIBRARY=commons-net
-VERSION=1.3.0
-BUILD=build
-SOURCES=src/java
-DIST=dist
-DOCS=docs
-APIDOC=$(DOCS)/api
-CLASSPATH=/usr/share/java/junit.jar:/usr/share/java/oro.jar
-BASE_PKG=org.apache.commons.net
+VERSION=1.4.1
 
-install/lib${LIBRARY}-java::
-	find ${SOURCES} -name \*.java | xargs\
-		jikes-classpath -classpath ${CLASSPATH}\
-	  -d ${BUILD} -sourcepath ${SOURCES}
-	mkdir ${DIST}
-	fastjar -cf ${DIST}/${LIBRARY}.jar -C ${BUILD} org
-	mkdir -p ${APIDOC}
-	gjdoc -d ${APIDOC} -sourcepath ${SOURCES}\
-		${BASE_PKG} ${BASE_PKG}.bsd ${BASE_PKG}.ftp ${BASE_PKG}.ftp.parser\
-		${BASE_PKG}.io ${BASE_PKG}.nntp ${BASE_PKG}.pop3 ${BASE_PKG}.smtp\
-		${BASE_PKG}.telnet ${BASE_PKG}.tftp ${BASE_PKG}.util
-	install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
-	echo "usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar" > debian/lib${LIBRARY}-java.links
+install/lib$(LIBRARY)-java::
+	install -m 644 target/$(LIBRARY)-$(VERSION).jar debian/lib$(LIBRARY)-java/usr/share/java/$(LIBRARY)-$(VERSION).jar
+	echo "usr/share/java/$(LIBRARY)-$(VERSION).jar usr/share/java/$(LIBRARY).jar" > debian/lib$(LIBRARY)-java.links
 
-clean::
-	-rm debian/lib${LIBRARY}-java.links gjdoc_rawcomment.cache
-	-rm -fr ${DIST} ${BUILD} ${APIDOC}
+#clean::
+#	-rm debian/lib$(LIBRARY)-java.links gjdoc_rawcomment.cache
+#	-rm -fr $(DIST) $(BUILD) $(APIDOC)

Modified: trunk/libcommons-net-java/debian/watch
===================================================================
--- trunk/libcommons-net-java/debian/watch	2006-08-01 09:08:56 UTC (rev 2303)
+++ trunk/libcommons-net-java/debian/watch	2006-08-01 10:03:19 UTC (rev 2304)
@@ -1,2 +1,2 @@
 version=2
-http://apache.belnet.be/jakarta/commons/net/source/commons-net-(.*)-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/jakarta/commons/net/source/commons-net-([0-9\.]*)-src\.tar\.gz debian uupdate

More information about the pkg-java-commits mailing list