This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository antlr.
commit b6f5a0dae93f5735c3241b2844879b4cecb72517 Author: Matthias Klose <[email protected]> Date: Thu Jul 31 10:15:32 2008 +0000 * antlr: Depend on default-jre-headless. * Don't directly build-depend on gcj. --- debian/Makefile.debian | 6 +++--- debian/changelog | 7 ++++++- debian/control | 4 ++-- debian/rules | 10 ++++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/debian/Makefile.debian b/debian/Makefile.debian index 78c1a8f..be6effb 100644 --- a/debian/Makefile.debian +++ b/debian/Makefile.debian @@ -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 @@ makejar: 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'` diff --git a/debian/changelog b/debian/changelog index db3d2bf..71bc06e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ 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 diff --git a/debian/control b/debian/control index df940c4..d35f188 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel 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 @@ Homepage: http://www.antlr2.org/ 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, diff --git a/debian/rules b/debian/rules index 1ef68ff..71e8ffb 100755 --- a/debian/rules +++ b/debian/rules @@ -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: configure build-stamp 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 @@ install: build 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/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/antlr.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
