[pkg-java] r3286 - trunk/antlr/debian

[Michael Koch]

Author: mkoch
Date: 2007-04-20 19:57:09 +0000 (Fri, 20 Apr 2007)
New Revision: 3286

Modified:
   trunk/antlr/debian/Makefile.debian
   trunk/antlr/debian/changelog
   trunk/antlr/debian/control
   trunk/antlr/debian/rules
Log:
* Build with java-gcj-compat-dev.
* Don't Build-Depends on autotools-dev twice.
* Introduce debian/compat instead of DH_COMPAT var in debian/rules.
* Fixed older changelog entries to fix lintian warnings.


Modified: trunk/antlr/debian/Makefile.debian
===================================================================
--- trunk/antlr/debian/Makefile.debian	2007-04-20 15:52:51 UTC (rev 3285)
+++ trunk/antlr/debian/Makefile.debian	2007-04-20 19:57:09 UTC (rev 3286)
@@ -1,6 +1,6 @@
 # *** Debian rules start here ***
-JAVAC=jikes-classpath
-JAR=fastjar
+JAVAC=/usr/lib/jvm/java-gcj/bin/javac
+JAR=/usr/lib/jvm/java-gcj/bin/jar
 
 build_antlr: compile makejar 
 

Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog	2007-04-20 15:52:51 UTC (rev 3285)
+++ trunk/antlr/debian/changelog	2007-04-20 19:57:09 UTC (rev 3286)
@@ -1,3 +1,12 @@
+antlr (2.7.6-8) unstable; urgency=low
+
+  * Build with java-gcj-compat-dev.
+  * Don't Build-Depends on autotools-dev twice.
+  * Introduce debian/compat instead of DH_COMPAT var in debian/rules.
+  * Fixed older changelog entries to fix lintian warnings.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 20 Apr 2007 21:55:27 +0200
+
 antlr (2.7.6-7) unstable; urgency=high
 
   * Added Build-Conflict with mono-jit (Closes: #409726).
@@ -231,13 +240,14 @@
 
 antlr (2.7.1-11) unstable; urgency=low
 
-  * Changed dependency from Kaffe to classpath (Closes #147235) 
+  * Changed dependency from Kaffe to classpath (Closes: #147235)
 
  -- John Leuner <jewel at debian.org>  Fri, 24 May 2002 14:01:16 +0100
 
 antlr (2.7.1-10) unstable; urgency=low
 
-  * Renamed /usr/bin/antlr to /usr/bin/runantlr because it conflicts with pccts. Closes #127898 
+  * Renamed /usr/bin/antlr to /usr/bin/runantlr because it conflicts with
+    pccts. Closes: #127898
 
  -- John Leuner <jewel at debian.org>  Mon,  7 Jan 2002 13:54:11 +0000
 
@@ -261,7 +271,8 @@
 
 antlr (2.7.1-6) unstable; urgency=low
 
-  * Changed Makefile to make the build shell scripts executable (seems to fail with build daemons) ( closes #105733 )
+  * Changed Makefile to make the build shell scripts executable (seems to fail
+    with build daemons) (Closes: #105733)
 
  -- John Leuner <jewel at debian.org>  Wed, 18 Jul 2001 18:07:35 +0000
 

Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control	2007-04-20 15:52:51 UTC (rev 3285)
+++ trunk/antlr/debian/control	2007-04-20 19:57:09 UTC (rev 3286)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, John Leuner <jewel at debian.org>, Michael Koch <konqueror at gmx.de>, Barry Hawkins <barry at bytemason.org>
-Build-Depends: debhelper (>= 4), kaffe, fastjar, classpath, jikes-classpath (>= 2:0.12-1), autotools-dev, gcj, libgcj-dev, python, autotools-dev
+Build-Depends: debhelper (>= 4), java-gcj-compat-dev, gcj, libgcj-dev, python, autotools-dev
 Build-Conflicts: mono-jit
 Standards-Version: 3.7.2
 
 Package: antlr
 Architecture: all
-Depends: kaffe | gij | sablevm | java-virtual-machine
+Depends: java-gcj-compat | java1-runtime | java2-runtime
 Description: language tool for constructing recognizers, compilers etc
  ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is 
  a language tool that provides a framework for constructing recognizers,

Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules	2007-04-20 15:52:51 UTC (rev 3285)
+++ trunk/antlr/debian/rules	2007-04-20 19:57:09 UTC (rev 3286)
@@ -3,14 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
 configure: configure-stamp
 configure-stamp: autotools
 	dh_testdir
 	cp /usr/share/misc/config.* scripts
-	BOOTCLASSPATH=/usr/share/classpath/glibj.zip JAVAC=jikes-classpath CLASSPATH=`pwd` JAVA=kaffe \
+	JAVAC=/usr/lib/jvm/java-gcj/bin/javac CLASSPATH=`pwd` JAVA=/usr/lib/jvm/java-gcj/bin/java \
 	./configure \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \