Author: doko
Date: 2008-07-31 10:15:32 +0000 (Thu, 31 Jul 2008)
New Revision: 6818
Modified:
trunk/antlr/debian/Makefile.debian
trunk/antlr/debian/changelog
trunk/antlr/debian/control
trunk/antlr/debian/rules
Log:
* antlr: Depend on default-jre-headless.
* Don't directly build-depend on gcj.
Modified: trunk/antlr/debian/Makefile.debian
===================================================================
--- trunk/antlr/debian/Makefile.debian 2008-07-31 09:53:02 UTC (rev 6817)
+++ trunk/antlr/debian/Makefile.debian 2008-07-31 10:15:32 UTC (rev 6818)
@@ -1,6 +1,6 @@
# *** Debian rules start here ***
-JAVAC=/usr/lib/jvm/java-gcj/bin/javac
-JAR=/usr/lib/jvm/java-gcj/bin/jar
+JAVAC=/usr/lib/jvm/default-java/bin/javac
+JAR=/usr/lib/jvm/default-java/bin/jar
build_antlr: compile makejar
@@ -18,7 +18,7 @@
make_with_gcj:
rm -f `find . -name '*.class'`
- gcj --main=antlr.Tool --CLASSPATH="." $(JAVA_FILES) -o cantlr
+ /usr/lib/jvm/java-gcj/bin/gcj --main=antlr.Tool --CLASSPATH="."
$(JAVA_FILES) -o cantlr
clean:
rm -f `find . -name '*.class'`
Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog 2008-07-31 09:53:02 UTC (rev 6817)
+++ trunk/antlr/debian/changelog 2008-07-31 10:15:32 UTC (rev 6818)
@@ -1,9 +1,14 @@
antlr (2.7.7-7) UNRELEASED; urgency=low
+ [Michael Koch]
* Updated watch file to match only Antlr v2.
- -- Michael Koch <[EMAIL PROTECTED]> Sat, 31 May 2008 08:59:10 +0200
+ [Matthias Klose]
+ * antlr: Depend on default-jre-headless.
+ * Don't directly build-depend on gcj.
+ -- Matthias Klose <[EMAIL PROTECTED]> Thu, 31 Jul 2008 10:08:46 +0000
+
antlr (2.7.7-6) unstable; urgency=low
* Made libantlr-cil arch:all, fixed debian/rules to build it only be
Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control 2008-07-31 09:53:02 UTC (rev 6817)
+++ trunk/antlr/debian/control 2008-07-31 10:15:32 UTC (rev 6818)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, John Leuner <[EMAIL
PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, Barry Hawkins <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), default-jdk-builddep, gcj, python,
autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
+Build-Depends: debhelper (>= 4), default-jdk-builddep, python, autotools-dev,
python-all-dev (>= 2.3.5-11), sharutils
Build-Depends-Indep: python-support (>= 0.3), nant, cli-common-dev (>= 0.4.4),
mono-mcs (>= 1.0) | c-sharp-compiler
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr
@@ -12,7 +12,7 @@
Package: antlr
Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, ${python:Depends}
+Depends: default-jre-headless | java1-runtime-headless |
java2-runtime-headless, ${python:Depends}
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 2008-07-31 09:53:02 UTC (rev 6817)
+++ trunk/antlr/debian/rules 2008-07-31 10:15:32 UTC (rev 6818)
@@ -4,6 +4,8 @@
#export DH_VERBOSE=1
export MONO_SHARED_DIR = $(shell pwd)/debian
+with_gcj := yes
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -25,7 +27,11 @@
build-stamp:
dh_testdir
uudecode -o debian/antlr.snk debian/antlr.snk.uue
+ifeq ($(with_gcj),yes)
$(MAKE) -f debian/Makefile.debian make_with_gcj
+else
+ $(MAKE) -f debian/Makefile.debian compile
+endif
$(MAKE) -C lib/cpp CXXFLAGS="+ -fPIC -DPIC"
mv -f lib/cpp/src/libantlr.a debian/libantlr-pic.a
$(MAKE) -C lib/cpp clean
@@ -75,7 +81,11 @@
dh_link -a
$(MAKE) -C lib/cpp install prefix=`pwd`/debian/libantlr-dev/usr
install -m755 scripts/antlr-config debian/libantlr-dev/usr/bin
+ifeq ($(with_gcj),yes)
install -m755 cantlr debian/cantlr/usr/bin
+else
+ install -m755 debian/cantlr.sh debian/cantlr/usr/bin
+endif
install -m644 CHANGES.txt debian/cantlr/usr/share/doc/cantlr/changelog
install -m644 CHANGES.txt
debian/libantlr-dev/usr/share/doc/libantlr-dev/changelog
install -m644 debian/libantlr-pic.a debian/libantlr-dev/usr/lib/
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
