[pkg-java] r7171 - trunk/antlr/debian
doko at alioth.debian.org
doko at alioth.debian.org
Mon Oct 20 08:37:25 UTC 2008
Author: doko
Date: 2008-10-20 08:37:24 +0000 (Mon, 20 Oct 2008)
New Revision: 7171
Added:
trunk/antlr/debian/libantlr-java.dirs
Modified:
trunk/antlr/debian/Makefile.debian
trunk/antlr/debian/antlr.dirs
trunk/antlr/debian/changelog
trunk/antlr/debian/control
trunk/antlr/debian/rules
Log:
antlr (2.7.7-8) unstable; urgency=low
* Build a libantlr-java package, without dependency on a java runtime.
Needed to bootstrap gcj without having a java runtime installed.
* Rename antlr-gcj to libantlr-java-gcj.
* Explicitely call javac with -source 1.4.
-- Matthias Klose <doko at debian.org> Mon, 20 Oct 2008 08:01:58 +0200
Modified: trunk/antlr/debian/Makefile.debian
===================================================================
--- trunk/antlr/debian/Makefile.debian 2008-10-18 20:33:35 UTC (rev 7170)
+++ trunk/antlr/debian/Makefile.debian 2008-10-20 08:37:24 UTC (rev 7171)
@@ -9,7 +9,7 @@
JAVA_FILES=`find antlr -name '*.java'`
#compile the java files from scratch and make an executable with gcj
compile:
- $(JAVAC) $(JAVA_FILES)
+ $(JAVAC) -source 1.4 $(JAVA_FILES)
makejar:
$(JAR) cf antlr.jar `find . -name '*.class'`
Modified: trunk/antlr/debian/antlr.dirs
===================================================================
--- trunk/antlr/debian/antlr.dirs 2008-10-18 20:33:35 UTC (rev 7170)
+++ trunk/antlr/debian/antlr.dirs 2008-10-20 08:37:24 UTC (rev 7171)
@@ -1,4 +1,3 @@
usr/bin
usr/share/doc/antlr
-usr/share/java
usr/share/python-support/antlr
Modified: trunk/antlr/debian/changelog
===================================================================
--- trunk/antlr/debian/changelog 2008-10-18 20:33:35 UTC (rev 7170)
+++ trunk/antlr/debian/changelog 2008-10-20 08:37:24 UTC (rev 7171)
@@ -1,3 +1,12 @@
+antlr (2.7.7-8) unstable; urgency=low
+
+ * Build a libantlr-java package, without dependency on a java runtime.
+ Needed to bootstrap gcj without having a java runtime installed.
+ * Rename antlr-gcj to libantlr-java-gcj.
+ * Explicitely call javac with -source 1.4.
+
+ -- Matthias Klose <doko at debian.org> Mon, 20 Oct 2008 08:01:58 +0200
+
antlr (2.7.7-7) unstable; urgency=low
[Michael Koch]
Modified: trunk/antlr/debian/control
===================================================================
--- trunk/antlr/debian/control 2008-10-18 20:33:35 UTC (rev 7170)
+++ trunk/antlr/debian/control 2008-10-20 08:37:24 UTC (rev 7171)
@@ -12,8 +12,7 @@
Package: antlr
Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, ${python:Depends}
-Recommends: antlr-gcj
+Depends: libantlr-java (= ${binary:Version}), 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,
@@ -29,10 +28,24 @@
files (e.g., HTML, SGML). ANTLR is designed to handle all of your
translation tasks.
-Package: antlr-gcj
+Package: libantlr-java
+Architecture: all
+Recommends: libantlr-gcj
+Replaces: antlr (<< 2.7.7-8)
+Description: language tool for constructing recognizers, compilers etc (java library)
+ 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 java libraries without a dependency on any runtime
+ to be able to bootstrap gcj without a dependency on a java runtime.
+
+Package: libantlr-java-gcj
Section: devel
Architecture: any
-Depends: antlr (>= ${source:Version}), ${shlibs:Depends}
+Depends: libantlr (>= ${source:Version}), ${shlibs:Depends}
+Replaces: antlr-gcj
Description: language tool for constructing recognizers, compilers etc
Native support for gij for antlr. ANTLR stands for ANother
Tool for Language Recognition, (formerly PCCTS). It is a language tool
Added: trunk/antlr/debian/libantlr-java.dirs
===================================================================
--- trunk/antlr/debian/libantlr-java.dirs (rev 0)
+++ trunk/antlr/debian/libantlr-java.dirs 2008-10-20 08:37:24 UTC (rev 7171)
@@ -0,0 +1,2 @@
+usr/share/doc/libantlr-java
+usr/share/java
Modified: trunk/antlr/debian/rules
===================================================================
--- trunk/antlr/debian/rules 2008-10-18 20:33:35 UTC (rev 7170)
+++ trunk/antlr/debian/rules 2008-10-20 08:37:24 UTC (rev 7171)
@@ -15,7 +15,7 @@
configure-stamp:
dh_testdir
cp /usr/share/misc/config.* scripts
- JAVAC=/usr/lib/jvm/default-java/bin/javac CLASSPATH=`pwd` JAVA=/usr/lib/jvm/default-java/bin/java \
+ JAVAC='/usr/lib/jvm/default-java/bin/javac -source 1.4' CLASSPATH=`pwd` JAVA=/usr/lib/jvm/default-java/bin/java \
./configure \
--prefix=/usr \
--mandir=\$${prefix}/share/man
@@ -69,6 +69,7 @@
dh_install -i
dh_link -i
$(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/antlr
+ mv debian/antlr/usr/share/java/* debian/libantlr-java/usr/share/java/
install -m644 lib/python/antlr/antlr.py debian/antlr/usr/share/python-support/antlr
install -m644 CHANGES.txt debian/antlr/usr/share/doc/antlr/changelog
install -m644 CHANGES.txt debian/antlr-doc/usr/share/doc/antlr-doc/changelog
@@ -124,17 +125,27 @@
dh_installman -pantlr
dh_installdocs -pantlr
dh_installchangelogs -pantlr
- dh_link -pantlr usr/share/java/antlr.jar usr/share/java/antlr.debug.jar usr/share/java/antlr.jar usr/share/java/antlrall.jar
dh_pysupport -pantlr
- dh_strip -pantlr
dh_compress -pantlr
dh_fixperms -pantlr
- dh_makeshlibs -pantlr
dh_installdeb -pantlr
- dh_shlibdeps -pantlr
dh_gencontrol -pantlr
dh_md5sums -pantlr
dh_builddeb -pantlr
+
+ # antlr
+ dh_installman -plibantlr-java
+ dh_installdocs -plibantlr-java
+ dh_installchangelogs -plibantlr-java
+ dh_link -plibantlr-java \
+ usr/share/java/antlr.jar usr/share/java/antlr.debug.jar \
+ usr/share/java/antlr.jar usr/share/java/antlrall.jar
+ dh_compress -plibantlr-java
+ dh_fixperms -plibantlr-java
+ dh_installdeb -plibantlr-java
+ dh_gencontrol -plibantlr-java
+ dh_md5sums -plibantlr-java
+ dh_builddeb -plibantlr-java
binary-arch: build install
@@ -156,21 +167,21 @@
dh_builddeb -plibantlr-dev -pcantlr
ifeq ($(with_native),yes)
- if [ ! -f debian/antlr/usr/share/java/antlr.jar ]; then \
- $(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/antlr; \
+ if [ ! -f debian/libantlr-java/usr/share/java/antlr.jar ]; then \
+ $(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/libantlr-java; \
fi
- mkdir -p debian/antlr-gcj/usr/share/doc
- ln -s antlr debian/antlr-gcj/usr/share/doc/antlr-gcj
- dh_nativejava -pantlr-gcj
- dh_strip -pantlr-gcj
- dh_compress -pantlr-gcj
- dh_fixperms -pantlr-gcj
- dh_makeshlibs -pantlr-gcj
- dh_installdeb -pantlr-gcj
- dh_shlibdeps -pantlr-gcj
- dh_gencontrol -pantlr-gcj
- dh_md5sums -pantlr-gcj
- dh_builddeb -pantlr-gcj
+ mkdir -p debian/libantlr-java-gcj/usr/share/doc
+ ln -s libantlr-java debian/libantlr-java-gcj/usr/share/doc/libantlr-java-gcj
+ dh_nativejava -plibantlr-java-gcj
+ dh_strip -plibantlr-java-gcj
+ dh_compress -plibantlr-java-gcj
+ dh_fixperms -plibantlr-java-gcj
+ dh_makeshlibs -plibantlr-java-gcj
+ dh_installdeb -plibantlr-java-gcj
+ dh_shlibdeps -plibantlr-java-gcj
+ dh_gencontrol -plibantlr-java-gcj
+ dh_md5sums -plibantlr-java-gcj
+ dh_builddeb -plibantlr-java-gcj
endif
binary: binary-indep binary-arch
More information about the pkg-java-commits
mailing list