Commit ef078a57 authored by Ben Burton's avatar Ben Burton Committed by Tony Mancill

Imported Debian patch 0.8.0.1-3

parent 623ad743
libreadline-java (0.8.0.1-3) unstable; urgency=low
* Allow libreadline-java to depend on either java1-runtime or java2-runtime,
since it doesn't use any deprecated java1 methods (closes: #297552).
* Build-depend on gcj-3.3 instead of gcj, so we don't get a version skew
between gcj and libgcj4-dev when the default gcj is upgraded.
-- Ben Burton <bab@debian.org> Fri, 18 Mar 2005 07:53:04 +1100
libreadline-java (0.8.0.1-2) unstable; urgency=low
* Added build-depends on libgcj4-dev, which gcj no longer drags in on its
......
......@@ -2,13 +2,13 @@ Source: libreadline-java
Section: libs
Priority: optional
Maintainer: Ben Burton <bab@debian.org>
Build-Depends: debhelper (>> 3.0.0), fastjar, gcj, libedit-dev, libgcj4-dev, libreadline4-dev
Build-Depends: debhelper (>> 3.0.0), fastjar, gcj-3.3, libedit-dev, libgcj4-dev, libreadline4-dev
Standards-Version: 3.6.1
Package: libreadline-java
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, gij | java1-runtime
Depends: ${shlibs:Depends}, gij | java1-runtime | java2-runtime
Suggests: libreadline-java-doc, java-virtual-machine
Conflicts: lib-readline-java (<< 0.5-7), lib-editline-java (<< 0.5-3), libeditline-java (<< 0.6)
Replaces: lib-readline-java (<< 0.5-7), lib-editline-java (<< 0.5-3), libeditline-java (<< 0.6)
......
......@@ -29,7 +29,7 @@ BUILDDIR=$(shell pwd)/build
build: build-stamp
build-stamp:
dh_testdir
$(MAKE) JAVAC=gcj JC_FLAGS=-C \
$(MAKE) JAVAC=gcj-3.3 JC_FLAGS=-C \
CC=gcc JAVAINCLUDE=/usr/include JAVANATINC=/usr/include \
T_LIBS="JavaReadline JavaEditline"
touch build-stamp
......
......@@ -110,7 +110,7 @@ org_gnu_readline_Readline.$(OBJ_EXT): org_gnu_readline_Readline.h \
-c org_gnu_readline_Readline.c
org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class
gcjh -classpath $(BUILDDIR) -jni org.gnu.readline.Readline
gcjh-3.3 -classpath $(BUILDDIR) -jni org.gnu.readline.Readline
touch org_gnu_readline_Readline.h
clean:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment