CVS libjdom1-java/debian

[Wolfgang B??r]

Update of /cvsroot/pkg-java/libjdom1-java/debian
In directory haydn:/tmp/cvs-serv26088/debian

Modified Files:
	ant.properties changelog control docs rules 
Added Files:
	doc-base 
Removed Files:
	doxygen.cfg libjdom0-java.links 
Log Message:
libjdom1-java (1.0-2) unstable; urgency=low

  * Removed libjdom0-java.links file from old release
  * libant1.6-java to ant transition
  * Patched build.xml to build with target=1.3 to support JDK 1.3
  * Removed clean:: target - not needed anymore
  * Added suggests java-virtual-machine
  * Generated (normal) javadoc through gjdoc 
    + Added javadoc target to ant targets
    + Removed doxygen stuff (debian/rules, debian/control, doxygen.cfg)
    + Register documentation with doc-base
  * Standards-Version 3.6.2 (no changes)
  * Added myself to uploaders


--- /cvsroot/pkg-java/libjdom1-java/debian/ant.properties	2004/11/21 18:09:28	1.1.1.1
+++ /cvsroot/pkg-java/libjdom1-java/debian/ant.properties	2005/09/21 18:26:01	1.2
@@ -1,4 +1,2 @@
-#xml-apis.jar=/usr/share/java/xml-apis.jar
 xml-apis.jar=/usr/share/java/gnujaxp.jar
-#parser.jar/usr/share/java/xerces.jar
 parser.jar/usr/share/java/gnujaxp.jar
--- /cvsroot/pkg-java/libjdom1-java/debian/changelog	2004/11/21 19:28:54	1.2
+++ /cvsroot/pkg-java/libjdom1-java/debian/changelog	2005/09/21 18:26:01	1.3
@@ -1,8 +1,20 @@
 libjdom1-java (1.0-2) unstable; urgency=low
 
-  * debian/rules: corrected a typo in clean target
+  * Removed libjdom0-java.links file from old release
+  * libant1.6-java to ant transition
+  * Patched build.xml to build with target=1.3 to support JDK 1.3
+  * Removed clean:: target - not needed anymore
+  * Added suggests java-virtual-machine
+  * Generated (normal) javadoc through gjdoc 
+    + Added javadoc target to ant targets
+    + Removed doxygen stuff (debian/rules, debian/control, doxygen.cfg)
+    + Register documentation with doc-base
+  * Standards-Version 3.6.2 (no changes)
+  * Added myself to uploaders
 
- --
+  * Upload sponsored by Petter Reinholdtsen
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sun, 11 Sep 2005 18:36:14 +0200
 
 libjdom1-java (1.0-1) unstable; urgency=low
 
--- /cvsroot/pkg-java/libjdom1-java/debian/control	2004/11/21 18:09:28	1.1.1.1
+++ /cvsroot/pkg-java/libjdom1-java/debian/control	2005/09/21 18:26:01	1.2
@@ -2,13 +2,14 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Takashi Okamoto <tora at debian.org>
-Build-Depends-Indep: debhelper(>= 4.0), cdbs, kaffe, jikes-kaffe, libant1.6-java, doxygen, libgnujaxp-java, libsaxpath-java
-Standards-Version: 3.6.1
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper(>= 4.2.30), cdbs, kaffe, ant, libgnujaxp-java, libsaxpath-java
+Standards-Version: 3.6.2
 
 Package: libjdom1-java
 Architecture: all
 Depends: gij | kaffe | sablevm | java1-runtime | java2-runtime, libgnujaxp-java
+Suggests: java-virtual-machine
 Description: lightweight and fast library using XML
  JDOM is, quite simply, a Java representation of an XML document. JDOM
  provides a way to represent that document for easy and efficient
--- /cvsroot/pkg-java/libjdom1-java/debian/docs	2004/11/21 18:09:28	1.1.1.1
+++ /cvsroot/pkg-java/libjdom1-java/debian/docs	2005/09/21 18:26:01	1.2
@@ -1,2 +1,2 @@
 README.txt 
-html
+build/apidocs
--- /cvsroot/pkg-java/libjdom1-java/debian/rules	2004/11/21 19:28:54	1.2
+++ /cvsroot/pkg-java/libjdom1-java/debian/rules	2005/09/21 18:26:01	1.3
@@ -4,28 +4,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME_DIRS       := /usr/lib/kaffe
-ANT_HOME             := /usr/share/ant1.6
-DEB_JARS             := /usr/share/ant1.6/lib/ant-launcher.jar
+ANT_HOME             := /usr/share/ant
+DEB_JARS             := /usr/share/ant/lib/ant-launcher.jar
 DEB_ANT_COMPILER     := jikes
-DEB_ANT_BUILD_TARGET := package
+DEB_ANT_BUILD_TARGET := package javadoc
 
 LIBRARY=jdom1
 VERSION=1.0
 
 install/lib${LIBRARY}-java::
-	doxygen debian/doxygen.cfg
 	install -m 644 build/jdom.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
-	echo "usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar" > debian/lib${LIBRARY}-java.links
-
-clean::
-	-rm debian/lib${LIBRARY}-java.links
-	-rm -rf classes html jdom.tag
-	-rm -f ${LIBRARY}-${VERSION}.jar
+	ln -s ${LIBRARY}-${VERSION}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}.jar