[commons-io] 03/47: o Correcting dependencies, removing jamvm stuff.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository commons-io.

commit 8c2055c14f2b602102aae8751774f727a24e962e
Author: Trygve Laugstøl <trygvis at inamo.no>
Date:   Mon Sep 19 23:49:54 2005 +0000

    o Correcting dependencies, removing jamvm stuff.
---
 .cvsignore                         |  6 +++++-
 debian/.cvsignore                  |  5 +++++
 debian/control                     |  5 ++---
 debian/libcommons-io-java-doc.docs |  1 +
 debian/rules                       | 11 ++---------
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1781279..7cc9b18 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,12 +3,16 @@ NOTICE.txt
 PROPOSAL.html
 STATUS.html
 build
+build-stamp
 build.xml
+commons-io-1.0.jar
 dist
 docs
 maven.xml
+patch-stamp
 project.properties
 project.xml
 src
+target
+test
 xdocs
-commons-io-1.0.jar
diff --git a/debian/.cvsignore b/debian/.cvsignore
new file mode 100644
index 0000000..cda5733
--- /dev/null
+++ b/debian/.cvsignore
@@ -0,0 +1,5 @@
+files
+libcommons-io-java
+libcommons-io-java-doc
+libcommons-io-java.links
+patched
diff --git a/debian/control b/debian/control
index 3e5277e..125b7ab 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,17 @@ Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Trygve Laugstøl <trygvis at inamo.no>
-Build-Depends-Indep: debhelper (>> 4.0.0), jikes-classpath, fastjar, junit (>= 3.8.1), cdbs, gjdoc
+Build-Depends-Indep: debhelper (>> 4.0.0), junit (>= 3.8.1), dpatch, ant, kaffe (>> 2:1.1.5-3)
 Standards-Version: 3.6.2
 
 Package: libcommons-io-java
 Architecture: all
-Depends: kaffe | java2-runtime
+Depends: kaffe (>> 2:1.1.5-3) | java2-runtime
 Description: Common useful IO related classes
  Commons-IO contains utility classes, stream implementations, file filters and
  endian classes.
 
 Package: libcommons-io-java-doc
 Architecture: all
-Depends: kaffe | java2-runtime
 Description: Common useful IO related classes - documentation
  Includes JavaDoc only.
diff --git a/debian/libcommons-io-java-doc.docs b/debian/libcommons-io-java-doc.docs
new file mode 100644
index 0000000..62b6a7f
--- /dev/null
+++ b/debian/libcommons-io-java-doc.docs
@@ -0,0 +1 @@
+target/javadoc
diff --git a/debian/rules b/debian/rules
index 15a3217..50c9f7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,15 +8,8 @@ ANT_PROPS       := debian/ant.properties
 ANT_HOME        := /usr/share/ant
 ANT_CLASSPATH   := $(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:/usr/share/java/junit.jar
 VERBOSE			:= #-verbose
-
-# Kaffe setup
-#JAVA_HOME  		:= /usr/lib/kaffe
-#JAVACMD         := $(JAVA_HOME)/bin/java
-
-# JamVM setup
-JAVACMD         := /usr/bin/jamvm
-SYS_PROPERTIES	:= #-Dbootclasspath=/usr/share/classpath/glibj.zip
-ANT_CLASSPATH   := $(ANT_CLASSPATH):/usr/share/classpath/glibj.zip
+JAVA_HOME  		:= /usr/lib/kaffe
+JAVACMD         := $(JAVA_HOME)/bin/java
 
 ANT=$(JAVACMD) $(SYS_PROPERTIES) -classpath $(ANT_CLASSPATH) org.apache.tools.ant.Main $(VERBOSE) -propertyfile $(ANT_PROPS)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-io.git