r1709 - trunk/axis/debian

[Stephan Michels]

Author: tashiro-guest
Date: 2006-01-22 10:24:37 +0000 (Sun, 22 Jan 2006)
New Revision: 1709

Added:
   trunk/axis/debian/libaxis-java-doc.docs
Modified:
   trunk/axis/debian/control
   trunk/axis/debian/rules
Log:
Copy docs and javadocs in the correct location.
lib*-java-doc should go in "section: doc"


Modified: trunk/axis/debian/control
===================================================================
--- trunk/axis/debian/control	2006-01-21 19:43:31 UTC (rev 1708)
+++ trunk/axis/debian/control	2006-01-22 10:24:37 UTC (rev 1709)
@@ -9,6 +9,7 @@
 
 Package: libaxis-java
 Architecture: all
+Section: libs
 Suggests: libaxis-java-doc
 Depends:  kaffe (>= 2:1.1.5) | java1-runtime | java2-runtime, libservlet2.4-java, ant
 Description: A SOAP implementation in Java
@@ -28,6 +29,7 @@
 
 Package: libaxis-java-doc
 Architecture: all
+Section: doc
 Suggests: libaxis-java
 Description: Documentation for libaxis-java
  Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")

Added: trunk/axis/debian/libaxis-java-doc.docs
===================================================================
--- trunk/axis/debian/libaxis-java-doc.docs	2006-01-21 19:43:31 UTC (rev 1708)
+++ trunk/axis/debian/libaxis-java-doc.docs	2006-01-22 10:24:37 UTC (rev 1709)
@@ -0,0 +1,2 @@
+docs/*
+build/apiDocs

Modified: trunk/axis/debian/rules
===================================================================
--- trunk/axis/debian/rules	2006-01-21 19:43:31 UTC (rev 1708)
+++ trunk/axis/debian/rules	2006-01-22 10:24:37 UTC (rev 1709)
@@ -35,6 +35,12 @@
 LIBRARY_PACKAGE := axis
 API_VERSION     := 1.2.1
 
+#build/lib$(LIBRARY_PACKAGE)-java-doc::
+common-post-build-indep::
+	# Rename javadoc directory to ensure that the links 
+        # of the documentation works
+	mv build/javadocs build/apiDocs
+
 install/lib$(LIBRARY_PACKAGE)-java:: 
 	install -m 644 build/lib/$(LIBRARY_PACKAGE).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
 	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
@@ -48,4 +54,3 @@
 
 	install -m 644 build/lib/saaj.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/saaj-$(API_VERSION).jar
 	ln -s saaj-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/saaj.jar
-