[pkg-java] r9537 - trunk/ant/debian
Ludovic Claude
ludovicc-guest at alioth.debian.org
Mon Aug 3 18:07:38 UTC 2009
Author: ludovicc-guest
Date: 2009-08-03 18:07:38 +0000 (Mon, 03 Aug 2009)
New Revision: 9537
Added:
trunk/ant/debian/ant-doc.install
Modified:
trunk/ant/debian/ant-doc.doc-base.1
trunk/ant/debian/ant-doc.docs
trunk/ant/debian/changelog
trunk/ant/debian/control
trunk/ant/debian/maven.rules
trunk/ant/debian/rules
Log:
* Bump up Standards-Version to 3.8.2
* Move Ant Javadoc to /usr/share/doc/ant/api/
* Deploy missing POM files for ant-optional package
* Fix version for antlr, bcel, commons-net, log4j dependencies in the
Maven POMs.
* Fix version for antlr, bcel, commons-net, log4j dependencies in the
Maven POMs.
* Fix groupId and artifactId for commons-logging and regexp
dependencies in the Maven POMs.
* Fix Ant version in the Maven repository
Modified: trunk/ant/debian/ant-doc.doc-base.1
===================================================================
--- trunk/ant/debian/ant-doc.doc-base.1 2009-08-03 18:04:45 UTC (rev 9536)
+++ trunk/ant/debian/ant-doc.doc-base.1 2009-08-03 18:07:38 UTC (rev 9537)
@@ -1,4 +1,4 @@
-Document: ant-doc1
+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
@@ -6,5 +6,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/ant-doc/javadocs/index.html
-Files: /usr/share/doc/ant-doc/javadocs/*.html
+Index: /usr/share/doc/ant/api/index.html
+Files: /usr/share/doc/ant/api/*.html
Modified: trunk/ant/debian/ant-doc.docs
===================================================================
--- trunk/ant/debian/ant-doc.docs 2009-08-03 18:04:45 UTC (rev 9536)
+++ trunk/ant/debian/ant-doc.docs 2009-08-03 18:07:38 UTC (rev 9537)
@@ -1,4 +1,3 @@
-build/javadocs
docs/manual
docs/images
docs/*.html
Added: trunk/ant/debian/ant-doc.install
===================================================================
--- trunk/ant/debian/ant-doc.install (rev 0)
+++ trunk/ant/debian/ant-doc.install 2009-08-03 18:07:38 UTC (rev 9537)
@@ -0,0 +1,2 @@
+build/javadocs/* usr/share/doc/ant/api/
+
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2009-08-03 18:04:45 UTC (rev 9536)
+++ trunk/ant/debian/changelog 2009-08-03 18:07:38 UTC (rev 9537)
@@ -1,3 +1,18 @@
+ant (1.7.1-2) experimental; urgency=low
+
+ * Bump up Standards-Version to 3.8.2
+ * Move Ant Javadoc to /usr/share/doc/ant/api/
+ * Deploy missing POM files for ant-optional package
+ * Fix version for antlr, bcel, commons-net, log4j dependencies in the
+ Maven POMs.
+ * Fix version for antlr, bcel, commons-net, log4j dependencies in the
+ Maven POMs.
+ * Fix groupId and artifactId for commons-logging and regexp
+ dependencies in the Maven POMs.
+ * Fix Ant version in the Maven repository
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Wed, 22 Jul 2009 19:08:53 +0100
+
ant (1.7.1-1) experimental; urgency=low
[Ludovic Claude]
Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control 2009-08-03 18:04:45 UTC (rev 9536)
+++ trunk/ant/debian/control 2009-08-03 18:07:38 UTC (rev 9537)
@@ -4,8 +4,11 @@
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>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), default-jdk-builddep, maven-repo-helper, 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.1
+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
Homepage: http://ant.apache.org/
Modified: trunk/ant/debian/maven.rules
===================================================================
--- trunk/ant/debian/maven.rules 2009-08-03 18:04:45 UTC (rev 9536)
+++ trunk/ant/debian/maven.rules 2009-08-03 18:07:38 UTC (rev 9537)
@@ -1,2 +1,9 @@
junit junit jar s/3\..*/3.x/
+antlr antlr jar s/2\..*/2.x/
+s/bcel/org.apache.bcel/ bcel jar s/5\..*/5.x/
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/
+commons-net commons-net jar s/1\..+/1.x/
+commons-net commons-net jar s/2\..+/2.x/
+log4j log4j jar s/1\.2\..*/1.2.x/
+s/regexp/jakarta-regexp/ s/regexp/jakarta-regexp/ * s/.*/debian/
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2009-08-03 18:04:45 UTC (rev 9536)
+++ trunk/ant/debian/rules 2009-08-03 18:07:38 UTC (rev 9537)
@@ -48,7 +48,7 @@
install/ant:: build-ant
dh_install -pant
- mh_installpoms -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
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/
@@ -62,6 +62,7 @@
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
More information about the pkg-java-commits
mailing list