r1823 - trunk/libjdom0-java/debian

[Wolfgang Bär]

Author: wbaer-guest
Date: 2006-01-26 19:41:01 +0000 (Thu, 26 Jan 2006)
New Revision: 1823

Added:
   trunk/libjdom0-java/debian/compat
Modified:
   trunk/libjdom0-java/debian/changelog
   trunk/libjdom0-java/debian/control
   trunk/libjdom0-java/debian/rules
Log:
Update to kaffe transition upload.

Modified: trunk/libjdom0-java/debian/changelog
===================================================================
--- trunk/libjdom0-java/debian/changelog	2006-01-26 19:39:32 UTC (rev 1822)
+++ trunk/libjdom0-java/debian/changelog	2006-01-26 19:41:01 UTC (rev 1823)
@@ -1,3 +1,18 @@
+libjdom0-java (0.9b-2) unstable; urgency=low
+
+  * Removed libgnujaxp-java dependency - not needed anymore
+    + Updated debian/rules accordingly
+    + Removed dependencies from build-depends and depends
+  * Simplified depends line to kaffe | java1-runtime | java2-runtime
+  * Removed explicit usage of jikes compiler for upcoming kaffe transition
+    + debian/rules: use javac instead of jikes-kaffe
+    + debian/control: remove build-dep on jikes-kaffe
+  * Added compat file (level 4), adjusted debian/rules
+  * Standards-Version 3.6.2 (no changes)
+  * Removed Takashi from Uploaders, added myself
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu,  5 Jan 2006 10:04:38 +0100
+
 libjdom0-java (0.9b-1) unstable; urgency=low
 
   * New upstream release

Added: trunk/libjdom0-java/debian/compat
===================================================================
--- trunk/libjdom0-java/debian/compat	2006-01-26 19:39:32 UTC (rev 1822)
+++ trunk/libjdom0-java/debian/compat	2006-01-26 19:41:01 UTC (rev 1823)
@@ -0,0 +1 @@
+4

Modified: trunk/libjdom0-java/debian/control
===================================================================
--- trunk/libjdom0-java/debian/control	2006-01-26 19:39:32 UTC (rev 1822)
+++ trunk/libjdom0-java/debian/control	2006-01-26 19:41:01 UTC (rev 1823)
@@ -2,13 +2,13 @@
 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), kaffe, jikes-kaffe, doxygen, libgnujaxp-java, libsaxpath-java
-Standards-Version: 3.6.1
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper(>= 4.0), kaffe, doxygen, libsaxpath-java
+Standards-Version: 3.6.2
 
 Package: libjdom0-java
 Architecture: all
-Depends: gij | kaffe | sablevm | java1-runtime | java2-runtime, libgnujaxp-java
+Depends: kaffe | java1-runtime | java2-runtime
 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

Modified: trunk/libjdom0-java/debian/rules
===================================================================
--- trunk/libjdom0-java/debian/rules	2006-01-26 19:39:32 UTC (rev 1822)
+++ trunk/libjdom0-java/debian/rules	2006-01-26 19:41:01 UTC (rev 1823)
@@ -2,46 +2,45 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
+VERBOSE=1
 
 LIBNAME=jdom
 VERSION=0.9b
 
-# Uncomment this section to build with Kaffe
 export JAVA_HOME=/usr/lib/kaffe
-export JAVA=/usr/lib/kaffe/bin/java
-export JAVAC=/usr/bin/jikes-kaffe
-export JAR=/usr/lib/kaffe/bin/jar
-export CLASSPATH=/usr/share/kaffe-common/lib/rt.jar:/usr/share/java/gnujaxp.jar:/usr/share/java/saxpath.jar
-#$(CURDIR)/lib/jaxen-jdom.jar:$(CURDIR)/lib/jaxen-core.jar:$(CURDIR)/.
+export JAVA=$(JAVA_HOME)/bin/java
+export JAVAC=$(JAVA_HOME)/bin/javac
+export JAR=$(JAVA_HOME)/bin/jar
+export CLASSPATH=/usr/share/java/saxpath.jar
 
 package=libjdom0-java
 
 
 build: build-stamp
-	$(checkdir)
+	dh_testdir
 
 build-stamp: 
-	$(checkdir)
+	dh_testdir
 	cd src/java && ${JAVAC} -d ../../classes -classpath ${CLASSPATH} `find . -name "*.java" | grep -v Jaxen`
 	cd classes && ${JAR} cvf ../${LIBNAME}-${VERSION}.jar org
 	doxygen debian/doxygen.cfg
 	touch build-stamp
 
 clean:
-	$(checkdir)
-	dh_clean
+	dh_testdir
+	dh_testroot	
 	-rm -f build-stamp
 	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
+	-rm -rf debian/files* core debian/substvars
 	-rm -rf classes html jdom.tag
 	-rm -f ${LIBNAME}-${VERSION}.jar
+	dh_clean
 
-binary-indep: checkroot build-stamp
-	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
-	install -m 644 ${LIBNAME}-${VERSION}.jar debian/tmp/usr/share/java
+binary-indep: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs -i
+	install -m 644 ${LIBNAME}-${VERSION}.jar debian/libjdom0-java/usr/share/java
 	dh_installchangelogs CHANGES.txt -i
 	dh_installdocs -i
 	dh_installexamples samples -i
@@ -52,17 +51,9 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: checkroot build
-	$(checkdir)
+binary-arch: build
+	dh_testdir
 
-define checkdir
-	test -f debian/rules
-endef
-
 binary: binary-indep binary-arch
 
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean