[pkg-java] r3655 - trunk/modello/debian

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2007-06-15 15:52:46 +0000 (Fri, 15 Jun 2007)
New Revision: 3655

Modified:
   trunk/modello/debian/build.properties
   trunk/modello/debian/changelog
   trunk/modello/debian/rules
Log:
Tidied production of API docs in "rules" etc

Modified: trunk/modello/debian/build.properties
===================================================================
--- trunk/modello/debian/build.properties	2007-06-15 11:51:06 UTC (rev 3654)
+++ trunk/modello/debian/build.properties	2007-06-15 15:52:46 UTC (rev 3655)
@@ -4,4 +4,4 @@
            ${basedir}/modello-core/build/modello-core-${version}.jar:\
            ${basedir}/modello-plugins/modello-plugin-xml/build/modello-plugin-xml-${version}.jar
 classpath.test=
-javadoc.dir=build/javadoc
+javadoc.dir=build/api

Modified: trunk/modello/debian/changelog
===================================================================
--- trunk/modello/debian/changelog	2007-06-15 11:51:06 UTC (rev 3654)
+++ trunk/modello/debian/changelog	2007-06-15 15:52:46 UTC (rev 3655)
@@ -2,4 +2,4 @@
 
   * Initial release. (Closes: 421626)
 
- -- Paul Cager <paul-debian at home.paulcager.org>  Sun, 29 Apr 2007 20:45:10 +0100
+ -- Paul Cager <paul-debian at home.paulcager.org>  Fri, 15 Jun 2007 16:52:20 +0100

Modified: trunk/modello/debian/rules
===================================================================
--- trunk/modello/debian/rules	2007-06-15 11:51:06 UTC (rev 3654)
+++ trunk/modello/debian/rules	2007-06-15 15:52:46 UTC (rev 3655)
@@ -12,7 +12,7 @@
 DEB_ANT_BUILD_TARGET := package javadoc
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS             := build/javadoc
+API_DOCS             := build/api
 SVN                  := https://svn.codehaus.org/modello/tags/modello-$(VERSION)
 
 get-orig-source:
@@ -34,6 +34,4 @@
 	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-plugin-xpp3-$(VERSION).jar usr/share/java/$(PACKAGE)-plugin-xpp3.jar
 
 binary-post-install/lib$(PACKAGE)-java-doc::
-	# maven-ant-helper puts the javadocs in build/javadocs. Policy requires directory to be named "api"
-	mv $(API_DOCS) build/api
 	dh_install -plib$(PACKAGE)-java-doc build/api usr/share/doc/lib$(PACKAGE)-java