-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
tags 331648 + patch
tags 325579 + patch
stop
Hi Nicolas,
Here is a patch to solve both #325579 and #331648. Also, if you want, I
can upload the patch.
And if you agree, I can move the package maintainer to
pkg-java-maintainers (and of course put you as the first uploader).
Thanks for your attention,
- --
.''`.
: :' :rnaud
`. `'
`-
Java Trap: http://www.gnu.org/philosophy/java-trap.html
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFDSsLi4vzFZu62tMIRAo/xAKCCHPedpPPAVwM6l6124x9qhxab3gCaAs8a
nUnjmE/aHFe/MOKh6P4Ui4A=
=JOEp
-----END PGP SIGNATURE-----
diff -ru debian.orig/changelog debian/changelog
--- debian.orig/changelog 2005-10-10 21:24:47.000000000 +0200
+++ debian/changelog 2005-10-10 21:30:50.000000000 +0200
@@ -1,3 +1,13 @@
+javacc (3.2+0-3) unstable; urgency=low
+
+ * ant transition (closes: #331648).
+ * changed the dependency to kaffe | java-runtime | java1-runtime |
+ java2-runtime, this way, any virtual machine can be used to run
+ javacc. I did not change the build-dependency because it's not needed
+ (closes: #325579).
+
+ -- Arnaud Vandyck <[EMAIL PROTECTED]> Mon, 10 Oct 2005 21:30:50 +0200
+
javacc (3.2+0-2) unstable; urgency=low
* Build-depends on libant1.6-java (closes: #300935)
diff -ru debian.orig/control debian/control
--- debian.orig/control 2005-10-10 21:24:47.000000000 +0200
+++ debian/control 2005-10-10 21:27:10.000000000 +0200
@@ -2,12 +2,12 @@
Section: devel
Priority: optional
Maintainer: Nicolas Sabouret <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.0.0), libant1.6-java, libxerces-java | libxerces2-java, kaffe, jikes, docbook-to-man
-Standards-Version: 3.6.1.1
+Build-Depends-Indep: debhelper (>= 4.0.0), ant, libxerces-java | libxerces2-java, kaffe, jikes, docbook-to-man
+Standards-Version: 3.6.2
Package: javacc
Architecture: all
-Depends: kaffe | java-virtual-machine, kaffe | java-runtime
+Depends: kaffe | java-runtime | java1-runtime | java2-runtime
Description: A parser generator for use with Java
Java Compiler Compiler [tm] (JavaCC [tm]) is (according to sun)
"the most popular parser generator" for use with Java [tm]
diff -ru debian.orig/rules debian/rules
--- debian.orig/rules 2005-10-10 21:24:47.000000000 +0200
+++ debian/rules 2005-10-10 21:25:06.000000000 +0200
@@ -14,7 +14,7 @@
# You need to set CLASSPATH here (even if your build.xml assembles its own
# class path) to ensure the same build results in all cases
JARS=/usr/share/java
-ANT_HOME=/usr/share/ant1.6
+ANT_HOME=/usr/share/ant
export CLASSPATH=${JARS}/xmlParserAPI.jar:${JARS}/xmlImpl.jar:${ANT_HOME}/lib/ant.jar:${ANT_HOME}/lib/ant-launcher.jar
# Ant options
