This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository libreadline-java.
commit ef078a57fa87e272a6196291b7fb5074e374beec Author: Ben Burton <[email protected]> Date: Fri Mar 18 07:53:04 2005 +1100 Imported Debian patch 0.8.0.1-3 --- debian/changelog | 9 +++++++++ debian/control | 4 ++-- debian/rules | 2 +- src/native/Makefile | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa56c1e..7e5efed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +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 <[email protected]> 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 diff --git a/debian/control b/debian/control index f630b19..25b3ca0 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: libreadline-java Section: libs Priority: optional Maintainer: Ben Burton <[email protected]> -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) diff --git a/debian/rules b/debian/rules index 78c7aaa..b6da5d8 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/src/native/Makefile b/src/native/Makefile index fe0168e..ccf50c7 100644 --- a/src/native/Makefile +++ b/src/native/Makefile @@ -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: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libreadline-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
