r2076 - in trunk/kaffe/debian: . man patches wrappers

Arnaud Vandyck avdyk at costa.debian.org
Mon Apr 24 22:19:19 UTC 2006 

Author: avdyk
Date: 2006-04-24 22:19:18 +0000 (Mon, 24 Apr 2006)
New Revision: 2076

Added:
   trunk/kaffe/debian/wrappers/jthreads-javac
   trunk/kaffe/debian/wrappers/pthreads-javac
Removed:
   trunk/kaffe/debian/kaffe-pthreads-profile.install
   trunk/kaffe/debian/kaffe-pthreads-profile.lintian
   trunk/kaffe/debian/patches/00_ECJ_Configure.patch
   trunk/kaffe/debian/rules.arm
   trunk/kaffe/debian/rules.mips
   trunk/kaffe/debian/rules.mipsel
   trunk/kaffe/debian/rules.powerpc
Modified:
   trunk/kaffe/debian/FileActions
   trunk/kaffe/debian/changelog
   trunk/kaffe/debian/control
   trunk/kaffe/debian/man/javah.kaffe.1
   trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch
   trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch
   trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
   trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch
   trunk/kaffe/debian/rules
Log:
kaffe (2:1.1.7-1) unstable; urgency=low

  * New upstream release
    + Adds new 1.5 String.replace method (closes: #357427)
    + Https support out of the box (closes: #351666)
    + Fixes wrong special character handling (closes: #255418)
    + Fixes deserialization error (closes: #328760)
    + Now checks for default encoding (closes: #338938)
    + kaffeh understands -force now (closes: #304927)
    + Works with eclipse (closes: #334012)
  * Use a wrapper script for javac to compile against kaffe's runtime
    classes (closes: #350091)
  * Move comments out of iteration in debian/rules (closes: #351053)
  * Updated debian/man/javah.kaffe.1 to include new -force option
  * Configure to use system zlib instead internal one
  * Dropped 00_ECJ_Configure.patch - applied upstream
  * Link jni_md.h and jawt_md.h to include/linux
  * New build-dependency added: fastjar
  * Tighten dependency on ecj-bootstrap to force build with gcj-4.1

 -- Wolfgang Baer <WBaer at gmx.de>  Mon, 03 Apr 2006 09:51:43 +0200


Modified: trunk/kaffe/debian/FileActions
===================================================================
--- trunk/kaffe/debian/FileActions	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/FileActions	2006-04-24 22:19:18 UTC (rev 2076)
@@ -10,6 +10,10 @@
 Target: usr/lib/kaffe/include
 Action: link
 
+File: usr/lib/kaffe/include/kaffe/{jni_md.h,jawt_md.h}
+Target: usr/lib/kaffe/include
+Action: link
+
 ##################################################
 
 ############## runtime library ###################

Modified: trunk/kaffe/debian/changelog
===================================================================
--- trunk/kaffe/debian/changelog	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/changelog	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,3 +1,25 @@
+kaffe (2:1.1.7-1) unstable; urgency=low
+
+  * New upstream release
+    + Adds new 1.5 String.replace method (closes: #357427)
+    + Https support out of the box (closes: #351666)
+    + Fixes wrong special character handling (closes: #255418)
+    + Fixes deserialization error (closes: #328760)
+    + Now checks for default encoding (closes: #338938)
+    + kaffeh understands -force now (closes: #304927)
+    + Works with eclipse (closes: #334012)
+  * Use a wrapper script for javac to compile against kaffe's runtime 
+    classes (closes: #350091)
+  * Move comments out of iteration in debian/rules (closes: #351053)
+  * Updated debian/man/javah.kaffe.1 to include new -force option
+  * Configure to use system zlib instead internal one
+  * Dropped 00_ECJ_Configure.patch - applied upstream
+  * Link jni_md.h and jawt_md.h to include/linux
+  * New build-dependency added: fastjar
+  * Tighten dependency on ecj-bootstrap to force build with gcj-4.1
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Mon, 03 Apr 2006 09:51:43 +0200
+
 kaffe (2:1.1.6.91-2) unstable; urgency=low
 
   * Fix build-depends - I just learned that the autobuilders don't take

Modified: trunk/kaffe/debian/control
===================================================================
--- trunk/kaffe/debian/control	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/control	2006-04-24 22:19:18 UTC (rev 2076)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Ean R. Schuessler <ean at novare.net>, Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Michael Koch <konqueror at gmx.de>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends: debhelper (>= 4.1), libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, ecj-bootstrap, ecj-bootstrap-gcj [alpha arm hppa i386 ia64 powerpc s390 sparc], libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev, libxtst-dev, libx11-dev, libxext-dev, libxtst-dev, x-dev 
+Build-Depends: debhelper (>= 4.1), libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, fastjar, ecj-bootstrap (>= 3.1.2-4), ecj-bootstrap-gcj (>= 3.1.2-4) [alpha arm hppa i386 ia64 powerpc s390 sparc], libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev, libxtst-dev, libx11-dev, libxext-dev, libxtst-dev, x-dev 
 Standards-Version: 3.6.2
 
 Package: kaffe

Deleted: trunk/kaffe/debian/kaffe-pthreads-profile.install
===================================================================
--- trunk/kaffe/debian/kaffe-pthreads-profile.install	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/kaffe-pthreads-profile.install	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1 +0,0 @@
-usr/lib/kaffe/pthreads-profile

Deleted: trunk/kaffe/debian/kaffe-pthreads-profile.lintian
===================================================================
--- trunk/kaffe/debian/kaffe-pthreads-profile.lintian	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/kaffe-pthreads-profile.lintian	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1 +0,0 @@
-kaffe-pthreads-profile: unstripped-binary-or-object

Modified: trunk/kaffe/debian/man/javah.kaffe.1
===================================================================
--- trunk/kaffe/debian/man/javah.kaffe.1	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/man/javah.kaffe.1	2006-04-24 22:19:18 UTC (rev 2076)
@@ -35,6 +35,9 @@
 \fB\-d\fR \fi<directory>\fR
 Specify an output directory
 .TP
+\fB\-force\fR
+Always (over)write output file
+.TP
 \fB\-Xdebug\fR \fi<opts>\fR
 Specify Kaffe debug options.
 

Deleted: trunk/kaffe/debian/patches/00_ECJ_Configure.patch
===================================================================
--- trunk/kaffe/debian/patches/00_ECJ_Configure.patch	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/patches/00_ECJ_Configure.patch	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,14 +0,0 @@
---- kaffe-1.1.6.91/libraries/javalib/external/classpath/configure.orig	2006-01-14 15:51:46.000000000 +0100
-+++ kaffe-1.1.6.91/libraries/javalib/external/classpath/configure	2006-01-15 13:03:06.000000000 +0100
-@@ -27069,9 +27069,9 @@
- fi
- 
- 
--  if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx; then
-+  if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx && test "x${user_specified_javac}" != xecj; then
-       # FIXME: use autoconf error function
--      echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, or --with-gcjx" 1>&2
-+      echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, --with-ecj or --with-gcjx" 1>&2
-       exit 1
-   fi
- 

Modified: trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch
===================================================================
--- trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/patches/01_RemoveJikesBuildCompilerSetting.patch	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,5 +1,5 @@
---- kaffe-1.1.6.91/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java.orig	2005-10-19 22:15:26.000000000 +0200
-+++ kaffe-1.1.6.91/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java	2005-12-09 10:04:26.000000000 +0100
+--- kaffe-1.1.7/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java.orig	2005-10-19 22:15:26.000000000 +0200
++++ kaffe-1.1.7/libraries/javalib/vmspecific/gnu/classpath/VMSystemProperties.java	2005-12-09 10:04:26.000000000 +0100
 @@ -111,11 +111,6 @@
        properties.setProperty("java.runtime.name", properties.getProperty("java.vm.name"));
        properties.setProperty("java.runtime.version", properties.getProperty("java.vm.version"));

Modified: trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch
===================================================================
--- trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar.patch	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,5 +1,5 @@
 --- /dev/null	2005-12-09 08:19:17.504520000 +0100
-+++ kaffe-1.1.6.91/tools/javatools/javalib/com/sun/tools/javac/Main.java	2005-12-09 10:06:43.000000000 +0100
++++ kaffe-1.1.7/tools/javatools/javalib/com/sun/tools/javac/Main.java	2005-12-09 10:06:43.000000000 +0100
 @@ -0,0 +1,105 @@
 +/* Main.java -- implement com.sun.tools.javac.Main
 +   Copyright (C) 2004  Red Hat

Modified: trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch
===================================================================
--- trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/patches/02_IncludeEcjCompilerInToolsJar_Makefile.patch	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,5 +1,5 @@
---- kaffe-1.1.6.91/tools/javatools/javalib/Makefile.am.orig	2005-12-09 10:45:27.000000000 +0100
-+++ kaffe-1.1.6.91/tools/javatools/javalib/Makefile.am	2005-12-09 10:46:33.000000000 +0100
+--- kaffe-1.1.7/tools/javatools/javalib/Makefile.am.orig	2006-02-08 02:13:02.000000000 +0100
++++ kaffe-1.1.7/tools/javatools/javalib/Makefile.am	2006-04-03 10:46:17.000000000 +0200
 @@ -8,11 +8,12 @@
  # of this file.
  
@@ -14,9 +14,18 @@
  	gnu/classpath/tools/Util.java \
  	gnu/classpath/tools/javap/GnuByteCodeJavap.java \
  	gnu/classpath/tools/javap/Javap.java \
---- kaffe-1.1.6.91/tools/javatools/javalib/Makefile.in.orig	2005-12-09 10:45:27.000000000 +0100
-+++ kaffe-1.1.6.91/tools/javatools/javalib/Makefile.in	2005-12-09 10:48:21.000000000 +0100
-@@ -345,9 +345,10 @@
+@@ -29,7 +30,7 @@
+ EXTRA_DIST = \
+ 	$(tools_jar_SRCS)
+ 
+-JAR_CMD = ($(FASTJAR) cf $(CURDIR)/$@.new -C $(LIBDIR) $(SRCDIRS))
++JAR_CMD = ($(FASTJAR) cf $(CURDIR)/$@.new -C $(LIBDIR) gnu; $(FASTJAR) uf $(CURDIR)/$@.new -C $(LIBDIR) com)
+ 
+ LIBDIR = lib
+ 
+--- kaffe-1.1.7/tools/javatools/javalib/Makefile.in.orig	2006-03-27 02:43:14.000000000 +0200
++++ kaffe-1.1.7/tools/javatools/javalib/Makefile.in	2006-04-03 11:10:27.000000000 +0200
+@@ -358,9 +358,10 @@
  toolslibdir = @toolslibdir@
  with_engine = @with_engine@
  CLASSFILE = tools.jar
@@ -28,9 +37,18 @@
  	gnu/classpath/tools/Util.java \
  	gnu/classpath/tools/javap/GnuByteCodeJavap.java \
  	gnu/classpath/tools/javap/Javap.java \
-@@ -433,7 +434,7 @@
+@@ -374,7 +375,7 @@
+ EXTRA_DIST = \
+ 	$(tools_jar_SRCS)
  
+-JAR_CMD = ($(FASTJAR) cf $(CURDIR)/$@.new -C $(LIBDIR) $(SRCDIRS))
++JAR_CMD = ($(FASTJAR) cf $(CURDIR)/$@.new -C $(LIBDIR) gnu; $(FASTJAR) uf $(CURDIR)/$@.new -C $(LIBDIR) com)
+ LIBDIR = lib
+ rebuildLib = $(top_builddir)/libraries/javalib/rebuildLib
+ real_builddir = $(shell cd $(top_builddir) && pwd )
+@@ -446,7 +447,7 @@
  
+ 
  distdir: $(DISTFILES)
 -	$(mkdir_p) $(distdir)/gnu/classpath/tools $(distdir)/gnu/classpath/tools/javap $(distdir)/gnu/classpath/tools/native2ascii $(distdir)/gnu/classpath/tools/rmi/rmic $(distdir)/gnu/classpath/tools/serialver
 +	$(mkdir_p) $(distdir)/com/sun/tools/javac $(distdir)/gnu/classpath/tools $(distdir)/gnu/classpath/tools/javap $(distdir)/gnu/classpath/tools/native2ascii $(distdir)/gnu/classpath/tools/rmi/rmic $(distdir)/gnu/classpath/tools/serialver

Modified: trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch
===================================================================
--- trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/patches/03_RegisterIconvCharsetProvider.patch	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,4 +1,4 @@
 --- /dev/null	2005-10-02 10:30:59.122810144 +0200
-+++ kaffe-1.1.6.91/libraries/javalib/external/classpath/resource/META-INF/services/java.nio.charset.spi.CharsetProvider	2005-10-02 19:24:06.000000000 +0200
++++ kaffe-1.1.7/libraries/javalib/external/classpath/resource/META-INF/services/java.nio.charset.spi.CharsetProvider	2005-10-02 19:24:06.000000000 +0200
 @@ -0,0 +1 @@
 +gnu.java.nio.charset.iconv.IconvProvider

Modified: trunk/kaffe/debian/rules
===================================================================
--- trunk/kaffe/debian/rules	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/rules	2006-04-24 22:19:18 UTC (rev 2076)
@@ -35,6 +35,7 @@
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--with-jni-library-path='/usr/lib/jni' \
+		--with-system-zlib \
 		--without-kaffe-qt-awt \
 		--without-kaffe-x-awt \
 		--disable-nls \
@@ -79,7 +80,7 @@
 # DBS
 #
 export DH_COMPAT=4
-RELEASE = 1.1.6.91
+RELEASE = 1.1.7
 TAR_DIR = kaffe-$(RELEASE)
 # the dbs rules
 include /usr/share/dbs/dbs-build.mk
@@ -140,21 +141,21 @@
 	dh_clean -k
 	dh_installdirs
 	rm -rf debian/install
-	## Install for all systems into debian/install
+	# Install for all systems into debian/install
 	for i in $(SYSTEMS); do $(MAKE) -C build/$$i install DESTDIR=$(CURDIR)/debian/install; done
 	perl debian/file-actions.pl -v $(CURDIR)/debian/install
 	# Install jikes-kaffe wrapper
 	install -m 755 $(CURDIR)/debian/wrappers/jikes-kaffe $(CURDIR)/debian/jikes-kaffe/usr/bin/jikes-kaffe
         # Various reorganization to use system provided tools	
+	# Remove javadoc and make it a symlink to gjdoc
+	# Remove jar and make it a symlink to fastjar,ecj
+	# make a rt.jar symlink to glibj.zip
 	for i in $(SYSTEMS); do \
-	  # Remove javadoc and make it a symlink to gjdoc \
 	  install -m 755 $(CURDIR)/debian/wrappers/javadoc $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javadoc; \
-	  # Remove jar/javac and make it a symlink to fastjar,ecj \
 	  rm $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/jar; \
 	  ln -s ../../../../bin/fastjar $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/jar; \
 	  rm $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javac; \
-	  ln -s ../../../../bin/ecj $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javac; \
-	  # make a rt.jar symlink to glibj.zip \
+	  install -m 755 $(CURDIR)/debian/wrappers/$$i-javac $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javac; \
 	  ln -sf ../../../../../share/kaffe-common/lib/glibj.zip $(CURDIR)/debian/install/usr/lib/kaffe/$$i/jre/lib/rt.jar; \
 	done
 	# install lintian overrides

Deleted: trunk/kaffe/debian/rules.arm
===================================================================
--- trunk/kaffe/debian/rules.arm	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/rules.arm	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,2 +0,0 @@
-COMPILER_JIKES =
-COMPILER_ECJ = 1

Deleted: trunk/kaffe/debian/rules.mips
===================================================================
--- trunk/kaffe/debian/rules.mips	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/rules.mips	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,2 +0,0 @@
-COMPILER_JIKES =
-COMPILER_ECJ = 1

Deleted: trunk/kaffe/debian/rules.mipsel
===================================================================
--- trunk/kaffe/debian/rules.mipsel	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/rules.mipsel	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1,2 +0,0 @@
-COMPILER_JIKES =
-COMPILER_ECJ = 1

Deleted: trunk/kaffe/debian/rules.powerpc
===================================================================
--- trunk/kaffe/debian/rules.powerpc	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/rules.powerpc	2006-04-24 22:19:18 UTC (rev 2076)
@@ -1 +0,0 @@
-INTRP_ENGINE = yes

Added: trunk/kaffe/debian/wrappers/jthreads-javac
===================================================================
--- trunk/kaffe/debian/wrappers/jthreads-javac	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/wrappers/jthreads-javac	2006-04-24 22:19:18 UTC (rev 2076)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+case $CLASSPATH in
+*/usr/share/java/ecj.jar*) ;;
+*) CLASSPATH=$CLASSPATH:/usr/share/java/ecj.jar
+esac
+
+export CLASSPATH
+
+exec /usr/lib/kaffe/jthreads/bin/java \
+     -Djava.ext.dirs=/usr/lib/java-ext:/usr/share/java-ext \
+     org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}	

Added: trunk/kaffe/debian/wrappers/pthreads-javac
===================================================================
--- trunk/kaffe/debian/wrappers/pthreads-javac	2006-04-24 21:39:31 UTC (rev 2075)
+++ trunk/kaffe/debian/wrappers/pthreads-javac	2006-04-24 22:19:18 UTC (rev 2076)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+case $CLASSPATH in
+*/usr/share/java/ecj.jar*) ;;
+*) CLASSPATH=$CLASSPATH:/usr/share/java/ecj.jar
+esac
+
+export CLASSPATH
+
+exec /usr/lib/kaffe/pthreads/bin/java \
+     -Djava.ext.dirs=/usr/lib/java-ext:/usr/share/java-ext \
+     org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}

More information about the pkg-java-commits mailing list