This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository libreadline-java.
commit 070e00b6e62f804bbf577bfaf15010c1e282cc13 Author: Ben Burton <[email protected]> Date: Tue Apr 26 07:48:31 2005 +1000 Imported Debian patch 0.8.0.1-4 --- debian/changelog | 14 ++++++++++++++ debian/control | 4 ++-- debian/rules | 2 +- src/native/Makefile | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e5efed..399719b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libreadline-java (0.8.0.1-4) unstable; urgency=low + + * Now that libgcj-dev is a real package that depends on a compatible gcj, + we can change the build-depends to use gcj and libgcj-dev + (instead of gcj-3.3 and libgcj4-dev) without risk of unwanted version + skew. This allows libreadline-java to be built on archs such as ppc64 + that only support gcc-4.0 (closes: #300353). + * Use a versioned build-depends on libgcj-dev to make sure we get the real + libgcj-dev and not the virtual one. Add a similar version on the gcj + build-depends also. + * Add a real alternative (w3m) to www-browser for libreadline-java-doc. + + -- Ben Burton <[email protected]> Tue, 26 Apr 2005 07:48:31 +1000 + libreadline-java (0.8.0.1-3) unstable; urgency=low * Allow libreadline-java to depend on either java1-runtime or java2-runtime, diff --git a/debian/control b/debian/control index 25b3ca0..c1d5fb7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libreadline-java Section: libs Priority: optional Maintainer: Ben Burton <[email protected]> -Build-Depends: debhelper (>> 3.0.0), fastjar, gcj-3.3, libedit-dev, libgcj4-dev, libreadline4-dev +Build-Depends: debhelper (>> 3.0.0), fastjar, gcj (>= 4:3.3.5), libedit-dev, libgcj-dev (>= 4:3.3.5), libreadline4-dev Standards-Version: 3.6.1 Package: libreadline-java @@ -28,7 +28,7 @@ Description: GNU readline and BSD editline wrappers for Java Package: libreadline-java-doc Architecture: all Section: doc -Recommends: www-browser +Recommends: w3m | www-browser Suggests: libreadline-java Conflicts: lib-readline-java (<= 0.5-4), lib-readline-java-doc (<< 0.5-7) Replaces: lib-readline-java-doc (<< 0.5-7) diff --git a/debian/rules b/debian/rules index b6da5d8..78c7aaa 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-3.3 JC_FLAGS=-C \ + $(MAKE) JAVAC=gcj 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 ccf50c7..fe0168e 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-3.3 -classpath $(BUILDDIR) -jni org.gnu.readline.Readline + gcjh -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
