[modello] 14/32: Tidied production of API docs in "rules" etc

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch modello-1.1
in repository modello.

commit d97143f1adc0270a5f622658e2842bcbf1267e2d
Author: Paul Cager <paul-debian at home.paulcager.org>
Date:   Fri Jun 15 15:52:46 2007 +0000

    Tidied production of API docs in "rules" etc
---
 debian/build.properties | 2 +-
 debian/changelog        | 2 +-
 debian/rules            | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
index 917ad71..3e5ffe6 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -4,4 +4,4 @@ classpath.compile=\
            ${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
diff --git a/debian/changelog b/debian/changelog
index 22056e5..046065c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ modello (1.0-alpha-13-1) unstable; urgency=low
 
   * 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
diff --git a/debian/rules b/debian/rules
index 6203f90..d942ba4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-tra
 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 @@ binary-post-install/lib$(PACKAGE)-java::
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/modello.git