CVS ant/debian

Arnaud Vandyck avdyk at haydn.debian.org
Sun Aug 7 22:19:17 UTC 2005 

Update of /cvsroot/pkg-java/ant/debian
In directory haydn:/tmp/cvs-serv10278

Modified Files:
	README.Debian ant-doc.docs ant.1 ant.install build.xml.5 
	changelog control rules 
Added Files:
	ant.properties 
Log Message:
ant (1.6.5-1) unstable; urgency=low

  * New upstream release
    + Build with kaffe/gjdoc/jikes
    + Move to main (closes: #290228)
    + Refractored SplashTask to remove sun internal classes
      patches 03_SplashTaskPatch_a/b/c.patch (submitted upstream)
    + Patched UUMailer.java to use sun internal classes via reflection
    + Updated src/script/ant patches
    + Patched build.xml to include maxmemory option to build javadoc
  * Splashscreen now works with kaffe/gij-4.0/jamvm packages
    (closes: #169755, #164401)
  * Removed extraneous files left by failed builds (closes: #310266)
  * Added libjsch-java to path and include ant-jsch (closes: #305674)
  * Added ant-jmf to ant.install
  * Added java1-runtime | java2-runtime as alternatives to kaffe to Depends
  * Moved ant-doc to section doc (closes: #253448)
  * According to upstream changelog ant junitreport for JDK 1.5
    was fixed already in 1.6.2 (closes: #273560)
  * Taskdef attributes are the same as for Typedef and therefore
    described through the provided link to Typedef manual (closes: #254683)
  * Updated README.Debian
  * Updated build.xml.5 and ant.1 manpages
  * Changed Build-Depends to Build-Depends-Indep to fix lintian warning
  * Moved java-virtual-machine to suggests
  * Used versioned dependency for libant1.6-java (same upstream version needed)
  * Call dh_installdocs directly to exclude redundant LICENSE files
  * Bumped Standards-Version to 3.6.2 - no changes
  * Added myself to uploaders
  * Upload sponsored by Arnaud Vandyck

 -- Wolfgang Baer <WBaer at gmx.de>  Thu, 23 Jun 2005 16:11:44 +0200


--- /cvsroot/pkg-java/ant/debian/README.Debian	2004/06/06 17:16:31	1.5
+++ /cvsroot/pkg-java/ant/debian/README.Debian	2005/08/07 22:19:17	1.6
@@ -20,11 +20,9 @@
   ant-stylebook
   ant-icontract
   ant-netrexx
-  ant-commons-net
   ant-starteam
   ant-vaj
   ant-jai
-  ant-jsch
   ant-weblogic
 
 - The JARs ant-junit.jar and ant-trax.jar are symlinks to the versions in the
@@ -40,7 +38,7 @@
                   org.apache.tools.ant.taskdefs.optional.Native2Ascii
 
   ant-launcher.jar can't be a symlink because Ant's automatic classpath builder
-  would follow the symlink and wronly add the JARs from /usr/share/ant1.6/lib/
+  would follow the symlink and wrongly add the JARs from /usr/share/ant1.6/lib/
   instead in /usr/share/ant/lib/.
 
 - All included JARs contain the same classes as upstream's binary distribution,
--- /cvsroot/pkg-java/ant/debian/ant-doc.docs	2004/03/10 00:49:27	1.3
+++ /cvsroot/pkg-java/ant/debian/ant-doc.docs	2005/08/07 22:19:17	1.4
@@ -1 +1,2 @@
 build/javadocs
+
--- /cvsroot/pkg-java/ant/debian/ant.1	2004/03/10 00:49:27	1.3
+++ /cvsroot/pkg-java/ant/debian/ant.1	2005/08/07 22:19:17	1.4
@@ -1,11 +1,11 @@
-.TH ant 1 "April 2001" "Debian/GNU Linux"
+.TH ant 1 "June 2005" "Debian/GNU Linux"
 .SH NAME
 ant \- a Java based make tool.
 
 .SH SYNOPSIS
 
 .B ant
-[\fIOPTION\fR]... [\fITARGET [\fITARGET2\fR] [\fITARGET3\fR] ...\fR]\fR]
+[\fIOPTIONS\fR] [\fITARGET\fR [\fITARGET2\fR [\fITARGET3\fR] ...\fR]\fR]
 
 .SH DESCRIPTION
 
@@ -23,28 +23,33 @@
 which describes the targets.
 
 .TP
-\fB\-help\fR
+\fB\-help, \-h\fR
 print help on the command line options
 .TP
-\fB\-projecthelp\fR
-gives information on possible targets for this project
+\fB\-projecthelp, \-p\fR
+print project help information
 .TP
 \fB\-version\fR
-returns the version number 
-.B ant
+print the version information
+.TP
+\fB\-diagnostics\fR
+print information that might be helpful to diagnose or report problems
 .TP
-\fB\-quiet\fR
+\fB\-quiet, \-q\fR
 be extra quiet
 .TP
-\fB\-verbose\fR
+\fB\-verbose, \-v\fR
 be extra verbose
 .TP
-\fB\-debug\fR
+\fB\-debug, \-d\fR
 print debugging information
 .TP
-\fB\-emacs\fR
+\fB\-emacs, \-e\fR
 produce logging information without adornments
 .TP
+\fB\-lib\fR <\fIpath\fR>
+specifies a path to search for jars and classes
+.TP
 \fB\-logfile\fR <\fIfile\fR>
 use the given file to output log to
 .TP
@@ -54,7 +59,7 @@
 \fB\-listener\fR <\fIclassname\fR>
 add an instance of the given class as a project listener
 .TP
-\fB\-buildfile\fR <\fIfile\fR>
+\fB\-buildfile, \-file, \-f\fR <\fIfile\fR>
 use the given buildfile instead of the default
 .B build.xml
 file. This is the 
@@ -64,6 +69,15 @@
 .TP
 \fB\-D\fR<\fIproperty\fR>=<\fIvalue\fR>
 use value for the given property
+.TP
+\fB\-propertyfile\fR <\fIname\fR>
+load all properties from file with \-D properties taking precedence
+.TP
+\fB\-inputhandler\fR <\fIclass\fR>
+the class which will handle input requests
+.TP
+\fB\-nice\fR <\fInumber\fR>
+A niceness value for the main thread: 1 (lowest) to 10 (highest); 5 is the default
 
 .SH SEE ALSO
 .BR make (1)
--- /cvsroot/pkg-java/ant/debian/ant.install	2004/08/14 23:31:08	1.3
+++ /cvsroot/pkg-java/ant/debian/ant.install	2005/08/07 22:19:17	1.4
@@ -3,16 +3,18 @@
 build/lib/ant-apache-bsf.jar		/usr/share/ant/lib/
 build/lib/ant-apache-log4j.jar		/usr/share/ant/lib/
 build/lib/ant-apache-oro.jar		/usr/share/ant/lib/
-build/lib/ant-apache-regexp.jar	/usr/share/ant/lib/
+build/lib/ant-apache-regexp.jar		/usr/share/ant/lib/
 build/lib/ant-commons-logging.jar	/usr/share/ant/lib/
 build/lib/ant-javamail.jar		/usr/share/ant/lib/
 build/lib/ant-jdepend.jar		/usr/share/ant/lib/
 build/lib/ant-launcher.jar		/usr/share/ant/lib/
 build/lib/ant-nodeps.jar		/usr/share/ant/lib/
 build/lib/ant-swing.jar			/usr/share/ant/lib/
+build/lib/ant-jmf.jar			/usr/share/ant/lib/
 build/lib/ant.jar			/usr/share/ant/lib/
 src/etc/*.xsl				/usr/share/ant/etc/
 src/etc/checkstyle			/usr/share/ant/etc/
 build/lib/ant-apache-resolver.jar	/usr/share/ant/lib/
 build/lib/ant-bootstrap.jar		/usr/share/ant/lib/
 build/lib/ant-commons-net.jar		/usr/share/ant/lib/
+build/lib/ant-jsch.jar			/usr/share/ant/lib/
--- /cvsroot/pkg-java/ant/debian/build.xml.5	2003/06/24 14:34:41	1.2
+++ /cvsroot/pkg-java/ant/debian/build.xml.5	2005/08/07 22:19:17	1.3
@@ -1,4 +1,4 @@
-.TH build.xml 5 "April 2001" "Debian/GNU Linux"
+.TH build.xml 5 "June 2005" "Debian/GNU Linux"
 .SH NAME
 build.xml \- configuration file used by ant to build projects
 
@@ -9,7 +9,7 @@
 is the default configuration file used by
 .B ant
 to determine target to build for a specific project. It can be
-considered the ant equivalent of Makefile..
+considered the ant equivalent of Makefile.
 
 The format of
 .B ant
@@ -45,15 +45,20 @@
 .B Built-in tasks
 
 The built-in tasks are: \fIAnt\fR, \fIAntCall\fR, \fIAntStructure\fR,
-\fIApply\fR, \fIAvailable\fR, \fIChmod\fR, \fICopy\fR, \fICvs\fR, 
-\fIDelete\fR, \fIDeltree\fR, \fIEcho\fR, \fIExec\fR, \fIExecOn\fR,
-\fIFail\fR, \fIFilter\fR, \fIFixCRLF\fR, \fIGenKey\fR, \fIGet\fR,
-\fIGUnzip\fR, \fIGZip\fR, \fIJar\fR, \fIJava\fR, \fIJavac\fR, 
-\fIJavadoc/Javadoc2\fR, \fIMail\fR, \fIMkdir\fR, \fIMove\fR, \fIPatch\fR,
-\fIProperty\fR, \fIReplace\fR, \fIRmic\fR, \fISignJar\fR, \fISql\fR,
-\fIStyle\fR, \fITar\fR, \fITaskdef\fR, \fITouch\fR, \fITStamp\fR, \fIUnjar\fR,
-\fIUntar\fR, \fIUnwar\fR, \fIUnzip\fR, \fIUptodate\fR, \fIWar\fR, 
-\fIZip\fR
+\fIApply\fR, \fIAvailable\fR, \fIBasename\fR, \fIBuildNumber\fR,
+\fIBUnzip2\fR, \fIBZip2\fR, \fIChecksum\fR, \fIChmod\fR, \fIConcat\fR,
+\fICondition\fR, \fICopy\fR, \fICvs\fR, \fIDelete\fR, \fIDeltree\fR, 
+\fIDirname\fR, \fIEar\fR, \fIEcho\fR, \fIExec\fR, \fIFail\fR, \fIFilter\fR, 
+\fIFixCRLF\fR, \fIGenKey\fR, \fIGet\fR, \fIGUnzip\fR, \fIGZip\fR, 
+\fIImport\fR, \fIInput\fR, \fIJar\fR, \fIJava\fR, \fIJavac\fR, 
+\fIJavadoc\fR, \fILength\fR, \fILoadFile\fR, \fILoadProperties\fR, 
+\fIMail\fR, \fIMkdir\fR, \fIMove\fR, \fINice\fR, \fIParallel\fR, 
+\fIPatch\fR, \fIPathConvert\fR, \fIProperty\fR, \fIRecord\fR, 
+\fIReplace\fR, \fIRmic\fR, \fISequential\fR, \fISignJar\fR, \fISleep\fR, 
+\fISql\fR, \fIStyle\fR, \fISubant\fR, \fISync\fR, \fITar\fR, \fITaskdef\fR, 
+\fITempfile\fR, \fITouch\fR, \fITStamp\fR, \fITypedef\fR, \fIUnjar\fR,
+\fIUntar\fR, \fIUnwar\fR, \fIUnzip\fR, \fIUptodate\fR, \fIWaitfor\fR, 
+\fIWar\fR, \fIWhichResource\fR, \fIXmlProperty\fR, \fIXslt\fR, \fIZip\fR
 
 .TP
 \fBJava\fR
@@ -136,6 +141,9 @@
 \fBant.file\fR
 the absolute path of the buildfile.
 .TP
+\fBant.version\fR
+the version of Ant.
+.TP
 \fBant.project.name\fR
 the name of the project that is currently executing;
 it is set in the name attribute of <project>.
--- /cvsroot/pkg-java/ant/debian/changelog	2004/09/28 10:01:41	1.12
+++ /cvsroot/pkg-java/ant/debian/changelog	2005/08/07 22:19:17	1.13
@@ -1,3 +1,36 @@
+ant (1.6.5-1) unstable; urgency=low
+
+  * New upstream release
+    + Build with kaffe/gjdoc/jikes
+    + Move to main (closes: #290228)
+    + Refractored SplashTask to remove sun internal classes
+      patches 03_SplashTaskPatch_a/b/c.patch (submitted upstream)
+    + Patched UUMailer.java to use sun internal classes via reflection
+    + Updated src/script/ant patches
+    + Patched build.xml to include maxmemory option to build javadoc
+  * Splashscreen now works with kaffe/gij-4.0/jamvm packages 
+    (closes: #169755, #164401)
+  * Removed extraneous files left by failed builds (closes: #310266)
+  * Added libjsch-java to path and include ant-jsch (closes: #305674)
+  * Added ant-jmf to ant.install
+  * Added java1-runtime | java2-runtime as alternatives to kaffe to Depends
+  * Moved ant-doc to section doc (closes: #253448)
+  * According to upstream changelog ant junitreport for JDK 1.5 
+    was fixed already in 1.6.2 (closes: #273560)
+  * Taskdef attributes are the same as for Typedef and therefore
+    described through the provided link to Typedef manual (closes: #254683)
+  * Updated README.Debian
+  * Updated build.xml.5 and ant.1 manpages
+  * Changed Build-Depends to Build-Depends-Indep to fix lintian warning
+  * Moved java-virtual-machine to suggests
+  * Used versioned dependency for libant1.6-java (same upstream version needed)
+  * Call dh_installdocs directly to exclude redundant LICENSE files
+  * Bumped Standards-Version to 3.6.2 - no changes
+  * Added myself to uploaders
+  * Upload sponsored by Arnaud Vandyck
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu, 23 Jun 2005 16:11:44 +0200
+
 ant (1.6.2-2) unstable; urgency=low
 
   * added commons-net to the path when building (closes: #272556).
--- /cvsroot/pkg-java/ant/debian/control	2004/08/14 23:37:40	1.12
+++ /cvsroot/pkg-java/ant/debian/control	2005/08/07 22:19:17	1.13
@@ -1,17 +1,17 @@
 Source: ant
-Section: contrib/devel
+Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Takashi Okamoto <tora at debian.org>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), j2sdk1.4, libant1.6-java, libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java
-Standards-Version: 3.6.1
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), kaffe, libant1.6-java, libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Standards-Version: 3.6.2
 
 Package: ant
 Architecture: all
-Section: contrib/devel
+Section: devel
 Priority: optional
-Depends: kaffe | java-virtual-machine, libant1.6-java, libxerces2-java
-Suggests: ant-doc, jikes | java-compiler, libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java
+Depends: kaffe | java1-runtime | java2-runtime, libant1.6-java (>= 1.6.5-1), libant1.6-java (<< 1.6.6), libxerces2-java
+Suggests: java-virtual-machine, ant-doc, jikes | java-compiler, libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
 Conflicts: ant-doc (<< 1.5.4-2)
 Replaces: ant-doc (<< 1.5.4-2)
 Description: Java based build tool like make
@@ -22,7 +22,7 @@
 
 Package: ant-doc
 Architecture: all
-Section: contrib/devel
+Section: doc
 Priority: optional
 Suggests: ant
 Description: Java based build tool like make - API documentation
--- /cvsroot/pkg-java/ant/debian/rules	2004/09/28 10:01:41	1.10
+++ /cvsroot/pkg-java/ant/debian/rules	2005/08/07 22:19:17	1.11
@@ -7,12 +7,14 @@
 
 # Java home directory and Ant home directory. This package uses the
 # libant*-java package to build so we don't need to bootstrap first
-JAVA_HOME := /usr/lib/j2se/1.4
+JAVA_HOME := /usr/lib/kaffe
 ANT_HOME  := /usr/share/ant1.6
 
 # Additional JARs to add to the class path, either full path or just the
 # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS = ${ANT_HOME}/lib/ant-launcher.jar activation antlr bcel bsf commons-logging gnumail inetlib jdepend junit log4j-1.2 oro regexp xalan2 xml-commons-resolver-1.1 commons-net
+DEB_JARS = ${ANT_HOME}/lib/ant-launcher.jar activation antlr bcel bsf commons-logging gnumail inetlib jdepend junit log4j-1.2 oro regexp xalan2 xml-commons-resolver-1.1 commons-net jsch
+
+DEB_ANT_COMPILER := jikes
 
 # Ant target to call
 DEB_ANT_BUILD_TARGET   := jars javadocs
@@ -24,4 +26,7 @@
 	install -m 755 src/script/ant     debian/ant/usr/share/ant/bin
 	install -m 755 src/script/antRun  debian/ant/usr/share/ant/bin
 	install -m 755 src/script/*.pl    debian/ant/usr/share/ant/bin
+	dh_installdocs -pant -XLICENSE docs/manual docs/images docs/*.html docs/*.css docs/*.js NOTICE README WHATSNEW
 
+clean::
+	-rm gjdoc_rawcomment.cache

More information about the pkg-java-commits mailing list