[pkg-java] r11740 - trunk/ant1.7/debian

Torsten Werner twerner at alioth.debian.org
Sat Feb 27 16:06:35 UTC 2010


Author: twerner
Date: 2010-02-27 16:06:31 +0000 (Sat, 27 Feb 2010)
New Revision: 11740

Added:
   trunk/ant1.7/debian/ant1.7-optional.dirs
   trunk/ant1.7/debian/ant1.7-optional.poms
   trunk/ant1.7/debian/ant1.7.dirs
   trunk/ant1.7/debian/ant1.7.links
   trunk/ant1.7/debian/ant1.7.manpages
   trunk/ant1.7/debian/ant1.7.poms
Removed:
   trunk/ant1.7/debian/ant-doc.compress
   trunk/ant1.7/debian/ant-doc.dirs
   trunk/ant1.7/debian/ant-doc.doc-base.1
   trunk/ant1.7/debian/ant-doc.doc-base.2
   trunk/ant1.7/debian/ant-doc.docs
   trunk/ant1.7/debian/ant-doc.install
   trunk/ant1.7/debian/ant-doc.linda.override
   trunk/ant1.7/debian/ant-doc.links
   trunk/ant1.7/debian/ant-optional.dirs
   trunk/ant1.7/debian/ant-optional.poms
   trunk/ant1.7/debian/ant.dirs
   trunk/ant1.7/debian/ant.links
   trunk/ant1.7/debian/ant.manpages
   trunk/ant1.7/debian/ant.poms
Modified:
   trunk/ant1.7/debian/changelog
   trunk/ant1.7/debian/control
   trunk/ant1.7/debian/rules
Log:
* Rename source package to ant1.7 to provide an ant version for packages that
  are not compatible with 1.8.
* Remove doc package.
* Remove Arnaud from Uploaders list and add myself.
* Remove Conflicts and Replaces for very old versions of ant.
* Add Conflicts for newer versions of ant.

Deleted: trunk/ant1.7/debian/ant-doc.compress
===================================================================
--- trunk/ant1.7/debian/ant-doc.compress	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-doc.compress	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,3 +0,0 @@
-#!/bin/sh
-echo usr/share/doc/ant-doc/WHATSNEW
-echo usr/share/doc/ant-doc/changelog.Debian

Deleted: trunk/ant1.7/debian/ant-doc.dirs
===================================================================
--- trunk/ant1.7/debian/ant-doc.dirs	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-doc.dirs	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1 +0,0 @@
-usr/share/linda/overrides

Deleted: trunk/ant1.7/debian/ant-doc.doc-base.1
===================================================================
--- trunk/ant1.7/debian/ant-doc.doc-base.1	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-doc.doc-base.1	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,10 +0,0 @@
-Document: ant-api
-Title: Programmer API for ant (Java-based build system)
-Author: The Apache Ant Development Team
-Abstract: This is the programmer API of Ant, a system independent 
- (i.e. not shell based) build tool that uses XML files as "Makefiles".
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/ant/api/index.html
-Files: /usr/share/doc/ant/api/*.html

Deleted: trunk/ant1.7/debian/ant-doc.doc-base.2
===================================================================
--- trunk/ant1.7/debian/ant-doc.doc-base.2	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-doc.doc-base.2	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,10 +0,0 @@
-Document: ant-doc2
-Title: Manual for ant (Java-based build system)
-Author: The Apache Ant Development Team
-Abstract: This is the manual of Ant, a system independent (i.e. not shell
- based) build tool that uses XML files as "Makefiles".
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/ant-doc/index.html
-Files: /usr/share/doc/ant-doc/*.html

Deleted: trunk/ant1.7/debian/ant-doc.docs
===================================================================
--- trunk/ant1.7/debian/ant-doc.docs	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-doc.docs	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,7 +0,0 @@
-docs/manual
-docs/images
-docs/*.html
-docs/*.css
-NOTICE
-README
-WHATSNEW

Deleted: trunk/ant1.7/debian/ant-doc.install
===================================================================
--- trunk/ant1.7/debian/ant-doc.install	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-doc.install	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,2 +0,0 @@
-build/javadocs/* usr/share/doc/ant/api/
-

Deleted: trunk/ant1.7/debian/ant-doc.linda.override
===================================================================
--- trunk/ant1.7/debian/ant-doc.linda.override	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-doc.linda.override	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1 +0,0 @@
-Tag: html-only-changelog

Deleted: trunk/ant1.7/debian/ant-doc.links
===================================================================
--- trunk/ant1.7/debian/ant-doc.links	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-doc.links	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1 +0,0 @@
-/usr/share/doc/ant/api	/usr/share/doc/ant-doc/manual/api

Deleted: trunk/ant1.7/debian/ant-optional.dirs
===================================================================
--- trunk/ant1.7/debian/ant-optional.dirs	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-optional.dirs	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,3 +0,0 @@
-usr/share/ant/lib
-usr/share/ant/etc
-usr/share/java

Deleted: trunk/ant1.7/debian/ant-optional.poms
===================================================================
--- trunk/ant1.7/debian/ant-optional.poms	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant-optional.poms	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,18 +0,0 @@
-src/etc/poms/ant-nodeps/pom.xml
-src/etc/poms/ant-antlr/pom.xml
-src/etc/poms/ant-apache-bcel/pom.xml
-src/etc/poms/ant-apache-bsf/pom.xml
-src/etc/poms/ant-apache-log4j/pom.xml
-src/etc/poms/ant-apache-oro/pom.xml
-src/etc/poms/ant-apache-regexp/pom.xml
-src/etc/poms/ant-apache-resolver/pom.xml
-src/etc/poms/ant-commons-logging/pom.xml
-src/etc/poms/ant-commons-net/pom.xml
-src/etc/poms/ant-javamail/pom.xml
-src/etc/poms/ant-jdepend/pom.xml
-src/etc/poms/ant-jmf/pom.xml
-src/etc/poms/ant-jsch/pom.xml
-src/etc/poms/ant-junit/pom.xml
-src/etc/poms/ant-swing/pom.xml
-src/etc/poms/ant-trax/pom.xml
-

Deleted: trunk/ant1.7/debian/ant.dirs
===================================================================
--- trunk/ant1.7/debian/ant.dirs	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant.dirs	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,5 +0,0 @@
-usr/bin
-usr/share/ant/bin
-usr/share/ant/etc
-usr/share/ant/lib
-usr/share/java

Deleted: trunk/ant1.7/debian/ant.links
===================================================================
--- trunk/ant1.7/debian/ant.links	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant.links	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,2 +0,0 @@
-/usr/share/ant/bin/ant			/usr/bin/ant
-/usr/share/ant/etc/ant-bootstrap.jar	/usr/share/java/ant-bootstrap.jar

Deleted: trunk/ant1.7/debian/ant.manpages
===================================================================
--- trunk/ant1.7/debian/ant.manpages	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant.manpages	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,2 +0,0 @@
-debian/ant.1
-debian/build.xml.5

Deleted: trunk/ant1.7/debian/ant.poms
===================================================================
--- trunk/ant1.7/debian/ant.poms	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/ant.poms	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,4 +0,0 @@
-src/etc/poms/pom.xml --no-parent
-src/etc/poms/ant/pom.xml
-src/etc/poms/ant-launcher/pom.xml
-

Copied: trunk/ant1.7/debian/ant1.7-optional.dirs (from rev 11739, trunk/ant1.7/debian/ant-optional.dirs)
===================================================================
--- trunk/ant1.7/debian/ant1.7-optional.dirs	                        (rev 0)
+++ trunk/ant1.7/debian/ant1.7-optional.dirs	2010-02-27 16:06:31 UTC (rev 11740)
@@ -0,0 +1,3 @@
+usr/share/ant/lib
+usr/share/ant/etc
+usr/share/java

Copied: trunk/ant1.7/debian/ant1.7-optional.poms (from rev 11739, trunk/ant1.7/debian/ant-optional.poms)
===================================================================
--- trunk/ant1.7/debian/ant1.7-optional.poms	                        (rev 0)
+++ trunk/ant1.7/debian/ant1.7-optional.poms	2010-02-27 16:06:31 UTC (rev 11740)
@@ -0,0 +1,18 @@
+src/etc/poms/ant-nodeps/pom.xml
+src/etc/poms/ant-antlr/pom.xml
+src/etc/poms/ant-apache-bcel/pom.xml
+src/etc/poms/ant-apache-bsf/pom.xml
+src/etc/poms/ant-apache-log4j/pom.xml
+src/etc/poms/ant-apache-oro/pom.xml
+src/etc/poms/ant-apache-regexp/pom.xml
+src/etc/poms/ant-apache-resolver/pom.xml
+src/etc/poms/ant-commons-logging/pom.xml
+src/etc/poms/ant-commons-net/pom.xml
+src/etc/poms/ant-javamail/pom.xml
+src/etc/poms/ant-jdepend/pom.xml
+src/etc/poms/ant-jmf/pom.xml
+src/etc/poms/ant-jsch/pom.xml
+src/etc/poms/ant-junit/pom.xml
+src/etc/poms/ant-swing/pom.xml
+src/etc/poms/ant-trax/pom.xml
+

Copied: trunk/ant1.7/debian/ant1.7.dirs (from rev 11739, trunk/ant1.7/debian/ant.dirs)
===================================================================
--- trunk/ant1.7/debian/ant1.7.dirs	                        (rev 0)
+++ trunk/ant1.7/debian/ant1.7.dirs	2010-02-27 16:06:31 UTC (rev 11740)
@@ -0,0 +1,5 @@
+usr/bin
+usr/share/ant/bin
+usr/share/ant/etc
+usr/share/ant/lib
+usr/share/java

Copied: trunk/ant1.7/debian/ant1.7.links (from rev 11739, trunk/ant1.7/debian/ant.links)
===================================================================
--- trunk/ant1.7/debian/ant1.7.links	                        (rev 0)
+++ trunk/ant1.7/debian/ant1.7.links	2010-02-27 16:06:31 UTC (rev 11740)
@@ -0,0 +1,2 @@
+/usr/share/ant/bin/ant			/usr/bin/ant
+/usr/share/ant/etc/ant-bootstrap.jar	/usr/share/java/ant-bootstrap.jar

Copied: trunk/ant1.7/debian/ant1.7.manpages (from rev 11739, trunk/ant1.7/debian/ant.manpages)
===================================================================
--- trunk/ant1.7/debian/ant1.7.manpages	                        (rev 0)
+++ trunk/ant1.7/debian/ant1.7.manpages	2010-02-27 16:06:31 UTC (rev 11740)
@@ -0,0 +1,2 @@
+debian/ant.1
+debian/build.xml.5

Copied: trunk/ant1.7/debian/ant1.7.poms (from rev 11739, trunk/ant1.7/debian/ant.poms)
===================================================================
--- trunk/ant1.7/debian/ant1.7.poms	                        (rev 0)
+++ trunk/ant1.7/debian/ant1.7.poms	2010-02-27 16:06:31 UTC (rev 11740)
@@ -0,0 +1,4 @@
+src/etc/poms/pom.xml --no-parent
+src/etc/poms/ant/pom.xml
+src/etc/poms/ant-launcher/pom.xml
+

Modified: trunk/ant1.7/debian/changelog
===================================================================
--- trunk/ant1.7/debian/changelog	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/changelog	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,3 +1,14 @@
+ant1.7 (1.7.1-5) unstable; urgency=low
+
+  * Rename source package to ant1.7 to provide an ant version for packages that
+    are not compatible with 1.8.
+  * Remove doc package.
+  * Remove Arnaud from Uploaders list and add myself.
+  * Remove Conflicts and Replaces for very old versions of ant.
+  * Add Conflicts for newer versions of ant.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 27 Feb 2010 17:04:49 +0100
+
 ant (1.7.1-4) unstable; urgency=low
 
   * Fix link to /usr/share/doc/ant-doc/manual/api. You may

Modified: trunk/ant1.7/debian/control
===================================================================
--- trunk/ant1.7/debian/control	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/control	2010-02-27 16:06:31 UTC (rev 11740)
@@ -1,68 +1,58 @@
-Source: ant
+Source: ant1.7
 Section: java
 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>, Michael Koch <konqueror at gmx.de>,
- Matthias Klose <doko at debian.org>
+Uploaders: Stefan Gybas <sgybas at debian.org>, Michael Koch <konqueror at gmx.de>,
+ Matthias Klose <doko at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), default-jdk-builddep, maven-repo-helper (>= 0.7),
  libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>= 2.4.0), 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, libjaxp1.3-java
 Standards-Version: 3.8.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant1.7
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant1.7/
 Homepage: http://ant.apache.org/
 
-Package: ant
+Package: ant1.7
 Architecture: all
 Priority: optional
 Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, libxerces2-java
 Recommends: ant-optional, ant-gcj
 Suggests: default-jdk | java-compiler | java-sdk, ant-doc
-Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
-Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
+Conflicts: ant
 Description: Java based build tool like make
  A system independent (i.e. not shell based) build tool that uses XML
  files as "Makefiles". This package contains the scripts and the core
  tasks libraries. 
 
-Package: ant-gcj
+Package: ant1.7-gcj
 Architecture: any
 Priority: optional
 Depends: ant, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: ant-gcj
 Description: Java based build tool like make
  A system independent (i.e. not shell based) build tool that uses XML
  files as "Makefiles". This package contains the scripts and the core
  tasks libraries. 
 
-Package: ant-optional
+Package: ant1.7-optional
 Architecture: all
 Priority: optional
 Depends: ${misc:Depends}, ant (= ${source:Version})
 Recommends: ant-optional-gcj
 Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), libjaxp1.3-java, 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, javacc
-Conflicts: libant1.6-java
-Replaces: libant1.6-java
+Conflicts: ant-optional
 Description: Java based build tool like make - optional libraries
  A system independent (i.e. not shell based) build tool that uses XML
  files as "Makefiles". This package contains the optional tasks libraries.
 
-Package: ant-optional-gcj
+Package: ant1.7-optional-gcj
 Architecture: any
 Priority: optional
 Depends: ant-optional, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: ant-optional-gcj
 Description: Java based build tool like make - API documentation and manual
  A system independent (i.e. not shell based) build tool that uses XML files
  as "Makefiles". This package contains the manual of ant as well as the
  Javadoc API documentation.
 
-Package: ant-doc
-Architecture: all
-Section: doc
-Priority: optional
-Depends: ${misc:Depends}
-Suggests: ant
-Description: Java based build tool like make - API documentation and manual
- A system independent (i.e. not shell based) build tool that uses XML files
- as "Makefiles". This package contains the manual of ant as well as the
- Javadoc API documentation.

Modified: trunk/ant1.7/debian/rules
===================================================================
--- trunk/ant1.7/debian/rules	2010-02-27 15:34:54 UTC (rev 11739)
+++ trunk/ant1.7/debian/rules	2010-02-27 16:06:31 UTC (rev 11740)
@@ -46,64 +46,59 @@
 	ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/lib/xercesImpl.jar
 	touch stamp-build-ant
 
-install/ant:: build-ant
-	dh_install -pant
-	mh_installpoms -pant --set-version=$(VERSION)
-	mh_installjar -pant -l src/etc/poms/ant/pom.xml build/lib/ant.jar /usr/share/ant/lib/ant.jar
+install/ant1.7:: build-ant
+	dh_install -pant1.7
+	mh_installpoms -pant1.7 --set-version=$(VERSION)
+	mh_installjar -pant1.7 -l src/etc/poms/ant/pom.xml build/lib/ant.jar /usr/share/ant/lib/ant.jar
 	mh_installjar -pant -l src/etc/poms/ant-launcher/pom.xml build/lib/ant-launcher.jar /usr/share/ant/lib/ant-launcher.jar
-	dh_install -pant build/lib/ant-bootstrap.jar /usr/share/ant/etc/
+	dh_install -pant1.7 build/lib/ant-bootstrap.jar /usr/share/ant/etc/
 	# Installing these files does not work with dh_install because of
 	# the file permissions
-	mkdir -p debian/ant/usr/share/ant/bin
-	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
+	mkdir -p debian/ant1.7/usr/share/ant/bin
+	install -m 755 src/script/ant     debian/ant1.7/usr/share/ant/bin
+	install -m 755 src/script/antRun  debian/ant1.7/usr/share/ant/bin
+	install -m 755 src/script/*.pl    debian/ant1.7/usr/share/ant/bin
 
-install/ant-optional:: build-ant
-	dh_install -pant-optional src/etc/ant-update.xsl /usr/share/ant/etc/
-	dh_install -pant-optional src/etc/checkstyle     /usr/share/ant/etc/
-	mh_installpoms -pant-optional --set-version=$(VERSION)
-	mh_installjar -pant-optional -l src/etc/poms/ant-antlr/pom.xml build/lib/ant-antlr.jar /usr/share/ant/lib/ant-antlr.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-bcel/pom.xml build/lib/ant-apache-bcel.jar /usr/share/ant/lib/ant-apache-bcel.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-bsf/pom.xml build/lib/ant-apache-bsf.jar /usr/share/ant/lib/ant-apache-bsf.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-log4j/pom.xml build/lib/ant-apache-log4j.jar /usr/share/ant/lib/ant-apache-log4j.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-oro/pom.xml build/lib/ant-apache-oro.jar /usr/share/ant/lib/ant-apache-oro.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-regexp/pom.xml build/lib/ant-apache-regexp.jar /usr/share/ant/lib/ant-apache-regexp.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar /usr/share/ant/lib/ant-apache-resolver.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar /usr/share/ant/lib/ant-commons-logging.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-commons-net/pom.xml build/lib/ant-commons-net.jar /usr/share/ant/lib/ant-commons-net.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-javamail/pom.xml build/lib/ant-javamail.jar /usr/share/ant/lib/ant-javamail.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-jdepend/pom.xml build/lib/ant-jdepend.jar /usr/share/ant/lib/ant-jdepend.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-jmf/pom.xml build/lib/ant-jmf.jar /usr/share/ant/lib/ant-jmf.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-jsch/pom.xml build/lib/ant-jsch.jar /usr/share/ant/lib/ant-jsch.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-junit/pom.xml build/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-nodeps/pom.xml build/lib/ant-nodeps.jar /usr/share/ant/lib/ant-nodeps.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-swing/pom.xml build/lib/ant-swing.jar /usr/share/ant/lib/ant-swing.jar
-	mh_installjar -pant-optional -l src/etc/poms/ant-trax/pom.xml build/lib/ant-trax.jar /usr/share/ant/lib/ant-trax.jar
-	#mh_installjar -pant-optional src/etc/poms/ant-testutil/pom.xml ant-testutil/build/ant-testutil-$(VERSION).jar
-	#mh_installjar -pant-optional src/etc/poms/ant-stylebook/pom.xml ant-stylebook/build/ant-stylebook-$(VERSION).jar
-	#mh_installjar -pant-optional src/etc/poms/ant-jai/pom.xml ant-jai/build/ant-jai-$(VERSION).jar
-	#mh_installjar -pant-optional src/etc/poms/ant-netrexx/pom.xml ant-netrexx/build/ant-netrexx-$(VERSION).jar
-	#mh_installjar -pant-optional src/etc/poms/ant-starteam/pom.xml ant-starteam/build/ant-starteam-$(VERSION).jar
-	#mh_installjar -pant-optional src/etc/poms/ant-weblogic/pom.xml ant-weblogic/build/ant-weblogic-$(VERSION).jar
+install/ant1.7-optional:: build-ant
+	dh_install -pant1.7-optional src/etc/ant-update.xsl /usr/share/ant/etc/
+	dh_install -pant1.7-optional src/etc/checkstyle     /usr/share/ant/etc/
+	mh_installpoms -pant1.7-optional --set-version=$(VERSION)
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-antlr/pom.xml build/lib/ant-antlr.jar /usr/share/ant/lib/ant-antlr.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-apache-bcel/pom.xml build/lib/ant-apache-bcel.jar /usr/share/ant/lib/ant-apache-bcel.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-apache-bsf/pom.xml build/lib/ant-apache-bsf.jar /usr/share/ant/lib/ant-apache-bsf.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-apache-log4j/pom.xml build/lib/ant-apache-log4j.jar /usr/share/ant/lib/ant-apache-log4j.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-apache-oro/pom.xml build/lib/ant-apache-oro.jar /usr/share/ant/lib/ant-apache-oro.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-apache-regexp/pom.xml build/lib/ant-apache-regexp.jar /usr/share/ant/lib/ant-apache-regexp.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar /usr/share/ant/lib/ant-apache-resolver.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar /usr/share/ant/lib/ant-commons-logging.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-commons-net/pom.xml build/lib/ant-commons-net.jar /usr/share/ant/lib/ant-commons-net.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-javamail/pom.xml build/lib/ant-javamail.jar /usr/share/ant/lib/ant-javamail.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-jdepend/pom.xml build/lib/ant-jdepend.jar /usr/share/ant/lib/ant-jdepend.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-jmf/pom.xml build/lib/ant-jmf.jar /usr/share/ant/lib/ant-jmf.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-jsch/pom.xml build/lib/ant-jsch.jar /usr/share/ant/lib/ant-jsch.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-junit/pom.xml build/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-nodeps/pom.xml build/lib/ant-nodeps.jar /usr/share/ant/lib/ant-nodeps.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-swing/pom.xml build/lib/ant-swing.jar /usr/share/ant/lib/ant-swing.jar
+	mh_installjar -pant1.7-optional -l src/etc/poms/ant-trax/pom.xml build/lib/ant-trax.jar /usr/share/ant/lib/ant-trax.jar
+	#mh_installjar -pant1.7-optional src/etc/poms/ant-testutil/pom.xml ant-testutil/build/ant-testutil-$(VERSION).jar
+	#mh_installjar -pant1.7-optional src/etc/poms/ant-stylebook/pom.xml ant-stylebook/build/ant-stylebook-$(VERSION).jar
+	#mh_installjar -pant1.7-optional src/etc/poms/ant-jai/pom.xml ant-jai/build/ant-jai-$(VERSION).jar
+	#mh_installjar -pant1.7-optional src/etc/poms/ant-netrexx/pom.xml ant-netrexx/build/ant-netrexx-$(VERSION).jar
+	#mh_installjar -pant1.7-optional src/etc/poms/ant-starteam/pom.xml ant-starteam/build/ant-starteam-$(VERSION).jar
+	#mh_installjar -pant1.7-optional src/etc/poms/ant-weblogic/pom.xml ant-weblogic/build/ant-weblogic-$(VERSION).jar
 
 ifeq ($(with_gcj_native),yes)
-install/ant-gcj:: install/ant
-	dh_install -pant
-	dh_nativejava -pant-gcj
+install/ant1.7-gcj:: install/ant1.7
+	dh_install -pant1.7
+	dh_nativejava -pant1.7-gcj
 endif
 
 ifeq ($(with_gcj_native),yes)
-install/ant-optional-gcj:: install/ant-optional
-	dh_install -pant-optional
-	dh_nativejava -pant-optional-gcj
+install/ant1.7-optional-gcj:: install/ant1.7-optional
+	dh_install -pant1.7-optional
+	dh_nativejava -pant1.7-optional-gcj
 endif
 
-install/ant-doc::
-	-rm -f docs/manual/LICENSE
-	# install linda override - the changelog is not a changelog but a task description
-	install -m 644 debian/ant-doc.linda.override debian/ant-doc/usr/share/linda/overrides/ant-doc
-
 clean::
 	-rm -f gjdoc_rawcomment.cache
 	-rm -rf bin bootstrap build lib/*.jar




More information about the pkg-java-commits mailing list