CVS libgef-java/debian

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/libgef-java/debian
In directory haydn:/tmp/cvs-serv15691/debian

Modified Files:
	changelog control docs rules 
Added Files:
	compat 
Log Message:
move to main and RC bug fix

--- /cvsroot/pkg-java/libgef-java/debian/changelog	2004/02/01 01:34:55	1.5
+++ /cvsroot/pkg-java/libgef-java/debian/changelog	2005/04/29 12:07:54	1.6
@@ -1,8 +1,10 @@
-libgef-java (0.10-1) experimental; urgency=low
+libgef-java (0.9.6-6) unstable; urgency=low
 
-  * New upstream release
+  * Move to main! (now builds with libant1.6-java and kaffe).
+  * debian/control, debian/rules: changed the ant dependency (closes:
+    #306647).
 
- -- Arnaud Vandyck <avdyk@debian.org>  Sun,  1 Feb 2004 02:06:58 +0100
+ -- Arnaud Vandyck <avdyk@debian.org>  Fri, 29 Apr 2005 13:32:12 +0200
 
 libgef-java (0.9.6-5) unstable; urgency=low
 
--- /cvsroot/pkg-java/libgef-java/debian/control	2004/02/01 01:34:55	1.5
+++ /cvsroot/pkg-java/libgef-java/debian/control	2005/04/29 12:07:55	1.6
@@ -1,14 +1,14 @@
 Source: libgef-java
-Section: contrib/libs
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk@debian.org>
-Build-Depends-Indep: j2sdk1.3 | j2sdk1.4 | java2-compiler, debhelper (>= 4.1.0), cdbs (>= 0.4.5.3), libxerces-java, liblog4j1.2-java, libant1.5-java (>= 1.5), jikes
+Build-Depends-Indep: kaffe (>= 2:1.1.5), debhelper (>= 4.1.0), cdbs (>= 0.4.5.3), libxerces-java, liblog4j1.2-java, libant1.6-java, jikes
 Standards-Version: 3.6.0
 
 Package: libgef-java
 Architecture: all
-Depends: j2re1.4 | java2-runtime, libxerces-java, liblog4j1.2-java
+Depends: kaffe (>= 2:1.1.5) |java1-runtime | java2-runtime, libxerces-java, liblog4j1.2-java
 Description: Graph Editing Framework written entirely in Java
  This lib is needed by ArgoUML but can be used within different applications.
  .
--- /cvsroot/pkg-java/libgef-java/debian/docs	2004/02/01 01:34:55	1.3
+++ /cvsroot/pkg-java/libgef-java/debian/docs	2005/04/29 12:07:55	1.4
@@ -1 +1,2 @@
-readme.txt
+src/README.txt
+src/README.txt
--- /cvsroot/pkg-java/libgef-java/debian/rules	2004/02/01 01:34:55	1.5
+++ /cvsroot/pkg-java/libgef-java/debian/rules	2005/04/29 12:07:55	1.6
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules for Commons Beanutils (uses CDBS)
+# debian/rules for GEF (uses CDBS)
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -9,16 +9,18 @@
 
 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/j2se/1.3
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := log4j-1.2 xerces
+JAVA_HOME            := /usr/lib/kaffe
+ANT_HOME             := /usr/share/ant1.6
+DEB_JARS             := log4j-1.2 xerces $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_COMPILER     := jikes
-DEB_ANT_BUILD_TARGET := package #compile
+DEB_ANT_BUILD_TARGET := compile package
+DEB_BUILDDIR         := .
+DEB_ANT_BUILDFILE    := src/build.xml
+DEB_ANT_CLEAN_TARGET := clean
 
 LIBRARY=gef
-VERSION=0.10
+VERSION=0.9.6
 
 install/lib${LIBRARY}-java::
 #	dh_install lib/${LIBRARY}.jar usr/share/java/${LIBRARY}-${VERSION}.jar