CVS jakarta-log4j1.2/debian

[Kalle Kivimaa]

Update of /cvsroot/pkg-java/jakarta-log4j1.2/debian
In directory haydn:/tmp/cvs-serv31619

Modified Files:
	changelog rules 
Log Message:
Fixed bug 265746

--- /cvsroot/pkg-java/jakarta-log4j1.2/debian/changelog	2004/08/14 15:18:31	1.3
+++ /cvsroot/pkg-java/jakarta-log4j1.2/debian/changelog	2004/08/15 11:24:35	1.4
@@ -1,3 +1,9 @@
+jakarta-log4j1.2 (1.2.8-7) unstable; urgency=high
+
+  * Javadocs are now correctly generated (closes: #265746)
+  
+ -- Kalle Kivimaa <killer@debian.org>  Sun, 15 Aug 2004 15:00:00 +0300
+
 jakarta-log4j1.2 (1.2.8-6) unstable; urgency=high
 
   * rules script now correctly includes log4j.dtd (closes: #265704)
--- /cvsroot/pkg-java/jakarta-log4j1.2/debian/rules	2004/08/14 15:18:31	1.4
+++ /cvsroot/pkg-java/jakarta-log4j1.2/debian/rules	2004/08/15 11:24:35	1.5
@@ -17,6 +17,7 @@
 	dh_testdir
 	rm -rf src/java/org/apache/log4j/jmx/Agent.java src/java/org/apache/log4j/jmx/T.java src/java/org/apache/log4j/or/jms src/java/org/apache/log4j/jmx src/java/org/apache/log4j/net/JMS*.java src/java/org/apache/log4j/lf5 src/java/org/apache/log4j/chainsaw
 	find src/java -name \*.java > list.sources
+	#(cd src/java ; find . -name \*.java | sed -e 's!./!!' -e 's!.java!!' -e 's!/!.!g' > ../../gjdoc.sources)
 	touch configure-stamp
 
 build: configure-stamp build-stamp
@@ -28,7 +29,8 @@
 	jikes -classpath /usr/lib/kaffe/jre/lib/rt.jar:/usr/share/java/activation.jar:/usr/share/java/gnumail.jar:/usr/share/java/jaxp-1.2.jar:/usr/share/java/crimson.jar -sourcepath src/java -d dist/classes @list.sources
 	cp src/java/org/apache/log4j/xml/log4j.dtd dist/classes/org/apache/log4j/xml/
 	fastjar -cf dist/lib/${JARNAME}-${VERSION}.jar -C dist/classes org
-	gjdoc -d docs/api -sourcepath src/java org
+	gjdoc -d docs/api -sourcepath src/java `(cd src/java ; find . -type d | sed -e 's!./!!' -e 's!/!.!g' | grep org | grep -v test )`
+
 	touch build-stamp
 
 clean:
@@ -36,7 +38,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	rm -rf dist/classes dist/lib/*
-	rm -f build.properties list.sources
+	rm -f build.properties list.sources gjdoc.sources
 	find src -name "*.class" -exec rm {} \;
 	# Add here commands to clean up after the build process.
 	dh_clean