r2386 - trunk/xml-im-exporter/xml-im-exporter/debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-09-07 19:01:09 +0000 (Thu, 07 Sep 2006)
New Revision: 2386

Modified:
   trunk/xml-im-exporter/xml-im-exporter/debian/control
   trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.doc-base
   trunk/xml-im-exporter/xml-im-exporter/debian/rules
Log:
Merged debian branch (r2385).


Modified: trunk/xml-im-exporter/xml-im-exporter/debian/control
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/control	2006-09-07 18:58:35 UTC (rev 2385)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/control	2006-09-07 19:01:09 UTC (rev 2386)
@@ -21,8 +21,7 @@
 Package: libxml-im-exporter-java-doc
 Section: doc
 Architecture: all
-Depends: classpath-doc
-Suggests: libxml-im-exporter-java
+Suggests: libxml-im-exporter-java, classpath-doc
 Description: API documentation for libxml-im-exporter-java
  XML Im-/Exporter is a low level library to assist in the process of
  importing and exporting XML in Java programs. This package contains

Modified: trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.doc-base
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.doc-base	2006-09-07 18:58:35 UTC (rev 2385)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.doc-base	2006-09-07 19:01:09 UTC (rev 2386)
@@ -4,5 +4,5 @@
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/libxml-im-exporter-java-doc/javadoc/index.html
-Files: /usr/share/doc/libxml-im-exporter-java-doc/javadoc/*
+Index: /usr/share/doc/libxml-im-exporter-java-doc/api/index.html
+Files: /usr/share/doc/libxml-im-exporter-java-doc/api/*

Modified: trunk/xml-im-exporter/xml-im-exporter/debian/rules
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/rules	2006-09-07 18:58:35 UTC (rev 2385)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/rules	2006-09-07 19:01:09 UTC (rev 2386)
@@ -4,7 +4,7 @@
 DEB_JARS_BASE	:= /usr/share/java
 JAVACMD  	:= $(JAVA_HOME)/bin/java
 
-DEB_JARS  := ant ant-launcher
+DEB_JARS  := ant ant-launcher ant-junit junit
 
 DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
 		if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
@@ -29,7 +29,7 @@
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	$(ANT_INVOKE) jar javadocs
+	$(ANT_INVOKE) jar javadocs test
 	touch build-stamp
 
 clean:
@@ -49,6 +49,8 @@
 	dh_installdocs
 	mv $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/index.html \
 	   $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/README.html
+	mv $(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/javadoc \
+	   $(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/api
 	dh_installexamples
 	dh_installman
 	dh_link