[antlr3.2] 06/46: antlr3 (3.0.1+dfsg-3) unstable; urgency=low

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository antlr3.2.

commit 66a8901a8ef3fd7cfe0c74f1534fdc92d994d55d
Author: Matthias Klose <doko at debian.org>
Date:   Mon Sep 29 21:33:42 2008 +0000

    antlr3 (3.0.1+dfsg-3) unstable; urgency=low
    
      * antlr3: Depend on default-jre-headless.
      * Build an antlr3-gcj package.
    
     -- Matthias Klose <doko at debian.org>  Mon, 29 Sep 2008 23:18:19 +0200
---
 debian/changelog |  7 +++++++
 debian/control   | 16 ++++++++++++++--
 debian/rules     | 17 ++++++++++++++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff9a021..0805f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+antlr3 (3.0.1+dfsg-3) unstable; urgency=low
+
+  * antlr3: Depend on default-jre-headless.
+  * Build an antlr3-gcj package.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 29 Sep 2008 23:18:19 +0200
+
 antlr3 (3.0.1+dfsg-2) unstable; urgency=low
 
   * Add depends on libstringtemplate-java. Closes: #474719
diff --git a/debian/control b/debian/control
index f6ddcd8..2e450e2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,13 @@ Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 6), cdbs, java-gcj-compat-dev, ant-optional, antlr, libstringtemplate-java, junit
+Build-Depends: debhelper (>= 6), cdbs, default-jdk-builddep, ant-optional, antlr, libstringtemplate-java, junit
 Standards-Version: 3.7.3
 
 Package: antlr3
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libstringtemplate-java
+Depends: default-jre-headless | java1-runtime | java2-runtime, libstringtemplate-java
+Recommends: antlr3-gcj
 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,
@@ -23,3 +24,14 @@ Description: language tool for constructing recognizers, compilers etc
  graphical data files (e.g., PostScript, AutoCAD), text processing 
  files (e.g., HTML, SGML).  ANTLR is designed to handle all of your 
  translation tasks.
+
+Package: antlr3-gcj
+Architecture: any
+Depends: antlr3 (>= ${Source-Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: language tool for constructing recognizers, compilers etc (native code)
+ ANTLR, ANother Tool for Language Recognition, (formerly PCCTS) is 
+ a language tool that provides a framework for constructing recognizers,
+ compilers, and translators from grammatical descriptions containing C++
+ or Java actions [You can use PCCTS 1.xx to generate C-based parsers].
+ . 
+ This package contains the natively compiled code for use by gij.
diff --git a/debian/rules b/debian/rules
index ace91dd..0d27f1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,25 @@ include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+include /usr/share/gcj/debian_defaults
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_native := yes
+endif
+
+JAVA_HOME := /usr/lib/jvm/default-java
 
 DEB_JARS := ant-antlr antlr junit
 
 build/antlr3::
 	install -m 644 -D build/antlr.jar debian/antlr3/usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -pantlr3 /usr/share/java/antlr3-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/antlr3.jar
+
+binary-post-install/antlr3-gcj:: binary-post-install/antlr3
+	rm -rf debian/antlr3-gcj/usr/share/doc/antlr3-gcj
+	ln -s antlr3 \
+	    debian/antlr3-gcj/usr/share/doc/antlr3-gcj
+ifeq ($(with_native),yes)
+	dh_nativejava -pantlr3-gcj
+endif

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