CVS kaffe/debian
Arnaud Vandyck
avdyk at haydn.debian.org
Fri Sep 23 16:28:33 UTC 2005
Update of /cvsroot/pkg-java/kaffe/debian
In directory haydn:/tmp/cvs-serv712/debian
Modified Files:
FileActions README.Debian changelog control copyright
kaffe-dev.links kaffe.install rules rules.i386
Added Files:
kaffe.NEWS kaffe.lintian rules.arm rules.sparc
Log Message:
kaffe (2:1.1.6-1) experimental; urgency=low
* Final new upstream release
* Fixed minor packaging bug due to upstream move of tools.jar
* Wrong bug number for java/lang/Runtime.availableProcessors
in the last upload (closes: #305258)
* Switched to fastjar as jar program - as requested by upstream
(closes: #329229, #328328)
+ Updated debian/control to depend on fastjar
+ Removed current wrapper scripts and link to fastjar
* Fixing the arm build (closes: #227741)
+ Added conditional build-dep for ecj-bootstrap on arm
+ Introduced overridable decision for compiler selection in debian/rules
+ Added rules.arm to override default compiler decision to ecj
* Added some more information about the scope of kaffe as a JDK
replacement to the description (closes: #328648)
* Fixed javadoc.kaffe manpage to make lintian happy
* Added patch from upstream to fix tomcat5 with security manager
-- Wolfgang Baer <WBaer at gmx.de> Tue, 20 Sep 2005 21:57:17 +0200
--- /cvsroot/pkg-java/kaffe/debian/FileActions 2005/07/24 20:17:02 1.6
+++ /cvsroot/pkg-java/kaffe/debian/FileActions 2005/09/23 16:28:33 1.7
@@ -10,23 +10,23 @@
Target: usr/lib/kaffe/include
Action: link
-File: usr/lib/kaffe/pthreads-profile/include
-Target: usr/lib/kaffe/include
-Action: link
-
##################################################
############## runtime library ###################
-File: usr/lib/kaffe/jthreads/jre/lib/{rt.jar,tools.jar,gmpjavamath.jar}
+File: usr/lib/kaffe/jthreads/jre/lib/{rt.jar,gmpjavamath.jar}
Target: usr/share/kaffe-common/lib
Action: move-link
-File: usr/lib/kaffe/pthreads/jre/lib/{rt.jar,tools.jar,gmpjavamath.jar}
+File: usr/lib/kaffe/pthreads/jre/lib/{rt.jar,gmpjavamath.jar}
Target: usr/share/kaffe-common/lib
Action: link
-File: usr/lib/kaffe/pthreads-profile/jre/lib/{rt.jar,tools.jar,gmpjavamath.jar}
+File: usr/lib/kaffe/jthreads/lib/{tools.jar}
+Target: usr/share/kaffe-common/lib
+Action: move-link
+
+File: usr/lib/kaffe/pthreads/lib/{tools.jar}
Target: usr/share/kaffe-common/lib
Action: link
@@ -42,10 +42,6 @@
Target: usr/share/kaffe-common/jre/lib/security
Action: link
-File: usr/lib/kaffe/pthreads-profile/jre/lib/security
-Target: usr/share/kaffe-common/jre/lib/security
-Action: link
-
################################################
########### link the kaffe-system stuff #########
@@ -70,8 +66,5 @@
File: usr/lib/kaffe/jthreads/bin/appletviewer
Action: delete
-File: usr/lib/kaffe/pthreads-profile/bin/appletviewer
-Action: delete
-
#####################################################
--- /cvsroot/pkg-java/kaffe/debian/README.Debian 2005/04/11 17:14:42 1.1
+++ /cvsroot/pkg-java/kaffe/debian/README.Debian 2005/09/23 16:28:33 1.2
@@ -17,16 +17,10 @@
provided for situations where native POSIX threads are problematic,
less performant or unavailable.
- kaffe-pthreads-profile:
- A POSIX threads and profiling enabled version of the kaffe virtual machine.
- This will allow your multithreaded Java programs take advantage of native
- POSIX thread support and collect statistics on where your program spends
- its CPU time.
-
- You can have all the kaffe systems installed side by side without
+ You can have both kaffe systems installed side by side without
any problems. There is only one specific system selected for execution.
- To switch from pthreads to jthreads or pthreads-profile and back,
+ To switch from pthreads to jthreads and back,
you can use the alternative system:
update-alternatives --config kaffe-system
--- /cvsroot/pkg-java/kaffe/debian/changelog 2005/08/07 22:41:48 1.12
+++ /cvsroot/pkg-java/kaffe/debian/changelog 2005/09/23 16:28:33 1.13
@@ -1,9 +1,67 @@
-kaffe (2:1.1.5-6) UNRELEASED; urgency=low
+kaffe (2:1.1.6-1) experimental; urgency=low
- * Added patch (07_sparc_gcc4_fix.patch) to fix sparc build
- with gcc 4.0 - thanks dalibor !
+ * Final new upstream release
+ * Fixed minor packaging bug due to upstream move of tools.jar
+ * Wrong bug number for java/lang/Runtime.availableProcessors
+ in the last upload (closes: #305258)
+ * Switched to fastjar as jar program - as requested by upstream
+ (closes: #329229, #328328)
+ + Updated debian/control to depend on fastjar
+ + Removed current wrapper scripts and link to fastjar
+ * Fixing the arm build (closes: #227741)
+ + Added conditional build-dep for ecj-bootstrap on arm
+ + Introduced overridable decision for compiler selection in debian/rules
+ + Added rules.arm to override default compiler decision to ecj
+ * Added some more information about the scope of kaffe as a JDK
+ replacement to the description (closes: #328648)
+ * Fixed javadoc.kaffe manpage to make lintian happy
+ * Added patch from upstream to fix tomcat5 with security manager
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 20 Sep 2005 21:57:17 +0200
+
+kaffe (2:1.1.5-pre2-1.1.6-1) experimental; urgency=low
+
+ * New upstream prerelease fixing bugs:
+ + Upstream now uses nio libs instead of KaffeEncoder (closes: #308256)
+ + Incorrect computation results resolved upstream (closes: #255502)
+ + getMethodSignatureClass: Assertion `class->state >= CSTATE_DOING_LINK'
+ does no longer fail - tested with the provided testcase (closes: #308532)
+ + Tomcat4 / kaffe SecurityManager issues resolved (closes: #308745)
+ + java.nio.FileChannelImpl.lock() implemented (closes: #305623)
+ + setting java.util.logging.Logger handlers works now (closes: #307983)
+ + Un/compress contentlenght problem with HttpURLConnection
+ fixed upstream (closes: #317162)
+ + java/lang/Runtime.availableProcessors() implemented (closes: #305623)
+ * Updated copyright to reflect newly included stuff in kaffe
+ * Dropped pthreads-profile on i386 as profiling over JVMPI
+ is now supported on all platforms - updated everything
+ * Updated FileActions to reflect the recent move of tools.jar
+ * Added lintian override for kaffe: binary-without-manpage as the
+ manpage is available in another package which depends on kaffe
+ * Reworked configure options for pthreads system
+ + --enable-jvmpi for profiling
+ + --enable-gtk-cairo for building against cairo, added
+ libcairo2-dev as build depends to debian/control
+ * Reworked engine options
+ + Use interpreter by default
+ + JIT is enabled in the arch-specific rule files (only i386, sparc atm)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Mon, 19 Sep 2005 20:57:09 +0200
+
+kaffe (2:1.1.5-cvs20050808-2) unstable; urgency=low
+
+ * Upload to unstable. This upload is not perfect but please, be patient,
+ a new upstream release is coming...
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 26 Aug 2005 23:33:23 +0200
+
+kaffe (2:1.1.5-cvs20050808-1) experimental; urgency=low
+
+ * Experimental snapshot hopefully fixing some arch-specific issues
+ * Dropped all-but-one Debian-specific patches, the remaining one not being
+ related to the code
- -- Wolfgang Baer <WBaer at gmx.de> Mon, 08 Aug 2005 00:35:48 +0200
+ -- Jeroen van Wolffelaar <jeroen at wolffelaar.nl> Mon, 8 Aug 2005 18:09:41 +0200
kaffe (2:1.1.5-5) unstable; urgency=low
--- /cvsroot/pkg-java/kaffe/debian/control 2005/07/24 20:17:02 1.3
+++ /cvsroot/pkg-java/kaffe/debian/control 2005/09/23 16:28:33 1.4
@@ -3,23 +3,29 @@
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), xlibs-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, jikes, libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev
+Build-Depends: debhelper (>= 4.1), xlibs-dev, libpng12-dev, libjpeg62-dev, libungif4-dev, zlib1g-dev, libgmp3-dev, xutils, dbs, zip, jikes [!arm], ecj-bootstrap [arm], libgtk2.0-dev, libart-2.0-dev, libxml2-dev, libxslt1-dev, libasound2-dev, libesd0-dev, libcairo2-dev
Standards-Version: 3.6.2
Package: kaffe
Architecture: all
Depends: kaffe-pthreads (= ${Source-Version}) | kaffe-jthreads (= ${Source-Version})
+Conflicts: kaffe-pthreads-profile
+Replaces: kaffe-pthreads-profile
Description: A JVM to run Java bytecode
- A virtual machine designed to execute Java bytecode. It performs
- "just-in-time" code conversion from the abstract code to the host machine's
- native code. This will ultimately allow execution of Java code at the same
- speed as standard compiled code but while maintaining the advantages and
- flexibility of code independence.
+ A virtual machine designed to execute Java bytecode. Kaffe is a bit different
+ from the non-free JVMs in that there is not one package for a JRE and one
+ package for a JDK. Kaffe provides most of the functionality people expect from
+ a Java Development Kit (JDK). Depending on the architecture it either provides
+ an interpreter engine or a JIT engine (Just-in-time) for execution. If the JIT
+ engine is available Kaffe performs "just-in-time" code conversion from the
+ abstract code to the host machine's native code. This will ultimately allow
+ execution of bytecode at the same speed as standard compiled code but while
+ maintaining the advantages and flexibility of code independence.
Package: kaffe-jthreads
Architecture: any
Pre-Depends: kaffe-common (= ${Source-Version})
-Depends: ${shlibs:Depends}, jikes, gjdoc
+Depends: ${shlibs:Depends}, jikes, gjdoc, fastjar
Provides: java-virtual-machine, java-runtime, java1-runtime, java-compiler, kaffe
Description: A green threads enabled version of the Kaffe VM
Green threads enabled compiler for the Kaffe VM for situations where native
@@ -28,22 +34,12 @@
Package: kaffe-pthreads
Architecture: any
Pre-Depends: kaffe-common (= ${Source-Version})
-Depends: ${shlibs:Depends}, jikes, gjdoc
+Depends: ${shlibs:Depends}, jikes, gjdoc, fastjar
Provides: java-virtual-machine, java-runtime, java1-runtime, java-compiler, kaffe
Description: A POSIX threads enabled version of the Kaffe VM
This will allow your multithreaded Java programs take advantage of native
POSIX thread support.
-Package: kaffe-pthreads-profile
-Architecture: i386
-Pre-Depends: kaffe-common (= ${Source-Version})
-Depends: ${shlibs:Depends}, jikes, gjdoc
-Provides: java-virtual-machine, java-runtime, java1-runtime, java-compiler, kaffe
-Description: A POSIX threads and profiling enabled version of the Kaffe VM
- This will allow your multithreaded Java programs take advantage of native
- POSIX thread support and collect statistics on where your program spends
- its CPU time.
-
Package: kaffe-common
Architecture: all
Depends: java-common
--- /cvsroot/pkg-java/kaffe/debian/copyright 2005/04/03 21:03:07 1.1.1.1
+++ /cvsroot/pkg-java/kaffe/debian/copyright 2005/09/23 16:28:33 1.2
@@ -11,8 +11,8 @@
Kaffe uses code from other free software projects. Only code licensed
under a GPL compatible license can be merged in. You can find the
-licenses of third party sources either in their respective sources, of
-in license*.terms files in the top directory.
+licenses of third party sources either in their respective sources, or
+in license*.terms files in the top directory, or here.
* javax.sound
@@ -28,42 +28,124 @@
More information on tritonus is available from http://tritonus.org.
-* JAXP
+* gjdoc, javap, gnu.classpath.tools
-This code has been merged in from the GNU JAXP project. Kaffe is
-tracking this project's CVS HEAD.
+This code has been merged in from the GNU Classpath tools project.
+Kaffe is tracking this project's CVS HEAD.
-GNU JAXP is distributed under the GNU General Public License, with
-the "library exception" which permits its use as a library in
-conjunction with non-Free software:
-
- "As a special exception, if you link this library with other
- files to produce an executable, this library does not by itself
- cause the resulting executable to be covered by the GNU General
- Public License. This exception does not however invalidate any
- other reasons why the executable file might be covered by the GNU
- General Public License."
+The GNU Classpath tools project is distributed under the GNU General
+Public License Version 2.
-See license.terms for the text of the GNU General Public License.
+See license.terms for the text of the GNU General Public License
+Version 2.
-More information on GNU JAXP can be found at
-http://www.gnu.org/software/classpathx/jaxp/.
+More information on gjdoc and cp-tools can be found at
+http://www.gnu.org/software/cp-tools/.
-* java.util.regex
+* gnu.bytecode
-This code has been merged in from GNU regexp. Kaffe tracks this
+This code has been merged in from Kawa. Kaffe is tracking this
project's CVS HEAD.
-Thanks to Wes Biggs for providing kaffe with a working java.util.regex
-implementation over GNU regexp.
+The gnu.bytecode classes are licensed under the GNU General Public
+License Version 2 or any later version. The exact copyright notice
+is:
+
+ "The Java classes (with related files and documentation) in these packages
+ are copyright (C) 1996-2001, 2002 Per Bothner.
+
+ These classes are distributed in the hope that they will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License [included below] for more details.
+
+ These classes are free software. You can use and re-distribute a class
+ without restriction (in source or binary form) as long as you use a
+ version has not been modified in any way from a version released
+ by Per Bothner, Cygnus Solutions, or the Free Software Foundation.
+ (See the Kawa manual for more information.)
+ You may make and distribute a modified version, provided you follow
+ the terms of the GNU General Public License; either version 2,
+ or (at your option) any later version. (Version 2 is included below.)
+
+ If you have questions, contact Per Bothner,
+ 18651 Cynthia Avenue, Cupertino CA 95014, USA.
+ By email per at bothner.com."
+
+See license.terms for the text of the GNU General Public License
+Version 2.
+
+More information on Kawa can be found at
+http://www.gnu.org/software/kawa/.
+
+* gnu.crypto, javax.crypto, javax.security.auth, javax.security.sasl,
+ org.ietf.jgss
+
+This code has been merged in from GNU Crypto. Kaffe tracks this
+projects' CVS HEAD.
+
+Licensed under the GNU General Public License with a special exception:
+
+ "Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give
+ you permission to link this library with independent modules to
+ produce an executable, regardless of the license terms of these
+ independent modules, and to copy and distribute the resulting
+ executable under terms of your choice, provided that you also meet,
+ for each linked independent module, the terms and conditions of the
+ license of that module. An independent module is a module which is
+ not derived from or based on this library. If you modify this
+ library, you may extend this exception to your version of the
+ library, but you are not obligated to do so. If you do not wish to
+ do so, delete this exception statement from your version."
+
+See license.terms for details of the GNU GPL.
+
+More information on GNU Crypto is available from
+http://www.gnu.org/software/gnu-crypto/.
+
+* com.jcraft.jzlib
+
+This code has been merged in from Jessie. Kaffe tracks this
+projects' CVS HEAD.
+
+JZLib is licensed under a BSD-style license without an advertising
+clause:
+
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
-The GNU regexp library is distributed under the terms of the GNU
-Lesser General Public License. See license-lesser.terms for details.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-More information on GNU regexp can be found at
-http://www.cacas.org/java/gnu/regexp/.
+More information on JZLib is available from
+http://www.jcraft.com/jzlib/.
-* javax.net, javax.net.ssl, javax.security.cert
+* javax.net, javax.net.ssl, javax.security.cert, org.metastatic
This code has been merged in from Jessie. Kaffe tracks this
projects' CVS HEAD.
@@ -94,6 +176,104 @@
More information on Jessie is available from
http://www.nongnu.org/jessie/.
+* org.ietf.jgss
+
+The documentation of some of the files in org/ietf/jgss/ is derived from
+the text of RFC 2853: Generic Security Service API Version 2: Java Bindings.
+That document is covered under the following license notice:
+
+Copyright (C) The Internet Society (2000). All Rights Reserved.
+
+This document and translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it
+or assist in its implementation may be prepared, copied, published and
+distributed, in whole or in part, without restriction of any kind,
+provided that the above copyright notice and this paragraph are
+included on all such copies and derivative works. However, this
+document itself may not be modified in any way, such as by removing
+the copyright notice or references to the Internet Society or other
+Internet organizations, except as needed for the purpose of developing
+Internet standards in which case the procedures for copyrights defined
+in the Internet Standards process must be followed, or as required to
+translate it into languages other than English.
+
+* org.xbill.DNS
+
+This code has been taken from DNSJava 2.0.0.
+
+dnsjava is placed under the BSD license. Several files are also under
+additional licenses; see the individual files for details.
+
+Copyright (c) 1999-2003, Brian Wellington
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the dnsjava project nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The license for the additional files is:
+
+org/xbill/DNS/Tokenizer.java:
+
+// Copyright (c) 2003-2004 Brian Wellington (bwelling at xbill.org)
+//
+// Copyright (C) 2003-2004 Nominum, Inc.
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR ANY
+// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+// OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+
+* org/xbill/DNS/ZoneTransferIn.java
+
+// Copyright (c) 2003-2004 Brian Wellington (bwelling at xbill.org)
+// Parts of this are derived from lib/dns/xfrin.c from BIND 9; its copyright
+// notice follows.
+
+/*
+ * Copyright (C) 1999-2001 Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
* gnu.inet
FTP URL Connection handler and utility classes are taken from GNU
@@ -145,6 +325,36 @@
More information on GNU Classpath is available from
http://www.gnu.org/software/classpath/classpath.html.
+* libraries/clib/fdlibm
+
+fdlimb contains general algorithms useful for runtimes and compilers to
+support strict double and float mathematical operations.
+
+fdlibm files carry the following notices:
+
+ Copyright (c) 1991 by AT&T.
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose without fee is hereby granted, provided that this entire notice
+ is included in all copies of any software which is or includes a copy
+ or modification of this software and in all copies of the supporting
+ documentation for such software.
+
+ THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ WARRANTY. IN PARTICULAR, NEITHER THE AUTHOR NOR AT&T MAKES ANY
+ REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+
+ Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+
+ Developed at SunPro, a Sun Microsystems, Inc. business.
+ Permission to use, copy, modify, and distribute this
+ software is freely granted, provided that this notice
+ is preserved.
+
+The upstream for fdlibm is libgcj (http://gcc.gnu.org/java/), they sync
+again with the 'real' upstream (http://www.netlib.org/fdlibm/readme).
+
* Replacement functions for getaddrinfo
This code comes from Motoyuki Kasahara's <m-kasahr at sra.co.jp>
@@ -152,7 +362,7 @@
systems available at http://www.sra.co.jp/people/m-kasahr/getaddrinfo/
under the following GPL-compatible BSD like license:
-Redistribution and use in source and binary forms, with or without
+"Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
@@ -178,7 +388,80 @@
At the time of writing, Kaffe uses getaddrinfo 1.6.1.
-* M68k atomic compare_and_swap
+* Replacement functions for inet_ntop and inet_pton.
+
+These functions came from ircii available at
+http://www.eterna.com.au/ircii/ which is licensed
+under a BSD-type license without an advertisment clause.
+
+"/*
+ * Copyright (c) 1990 Michael Sandrof.
+ * Copyright (c) 1991, 1992 Troy Rollo.
+ * Copyright (c) 1992-2004 Matthew R. Green.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+One module of the source code, scandir.c is copyright (c) 1983
+by the Regents of the University of California, with modifications
+by various contributors. All rights are reserved by the
+University of California.
+
+One module of the source code, stringlist.c, is
+Copyright (c) 1994, 1999 The NetBSD Foundation, Inc.
+
+One module of the source code, stringlist.h, is
+Copyright (c) 1994 Christos Zoulas
+
+Two modules of the source code, get{addr,name}info.c, are
+Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+
+Two modules of the source code, inet_{ntop,pton}.c are
+Copyright (c) 1996 by Internet Software Consortium."
+
+The inet_ntop.c and inet_pton.c have the following permissive BSD-type
+license without an advertisement clause:
+
+"/* Copyright (c) 1996 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */"
+
+* Alpha, ARM, ia64, M68k, MIPS, S390 and SPARC atomic compare_and_swap,
+ Linux sigcontextinfo
Taken from GNU libc 2.3.2, which is licensed under the GNU Lesser General
Public License. See file license-lesser.terms for details.
@@ -192,7 +475,7 @@
and GPL. It is available from
http://www.gingerall.cz/charlie/ga/xml/p_sab.xml.
[438 lines skipped]
--- /cvsroot/pkg-java/kaffe/debian/kaffe-dev.links 2005/04/06 21:39:59 1.1
+++ /cvsroot/pkg-java/kaffe/debian/kaffe-dev.links 2005/09/23 16:28:33 1.2
@@ -1,2 +1 @@
usr/lib/kaffe/include/kaffe usr/lib/kaffe/include/linux
-
--- /cvsroot/pkg-java/kaffe/debian/kaffe.install 2005/04/03 21:03:05 1.1.1.1
+++ /cvsroot/pkg-java/kaffe/debian/kaffe.install 2005/09/23 16:28:33 1.2
@@ -1,4 +1,3 @@
usr/lib/kaffe/bin
usr/lib/kaffe/lib
usr/lib/kaffe/jre
-
--- /cvsroot/pkg-java/kaffe/debian/rules 2005/07/24 20:17:02 1.6
+++ /cvsroot/pkg-java/kaffe/debian/rules 2005/09/23 16:28:33 1.7
@@ -2,7 +2,8 @@
# Sample debian/rules that uses debhelper.
# GNU copyright 1997 to 1999 by Joey Hess.
-#DH_VERBOSE := 1
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -13,47 +14,35 @@
empty :=
space := $(empty) $(empty)
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
# these values can be overwritten in the rules.$(DEB_BUILD_GNU_TYPE) files
-KAFFE_JIKES := 1
-KAFFE_GCJ :=
+COMPILER_JIKES := 1
+COMPILER_ECJ :=
ENABLE_SOUND := yes
SYSTEMS := jthreads pthreads
+INTRP_ENGINE := yes
jthreads-PRIORITY := 0
pthreads-PRIORITY := 1000
-pthreads-profile-PRIORITY := -1000
-
-# uncomment for sarge backports
-#export CC=/usr/bin/gcc-3.4
-#export CXX=/usr/bin/g++-3.4
# Include any additional architecture specific rules
sinclude debian/rules.$(DEB_HOST_ARCH)
-CONFFLAGS := \
- --infodir='/usr/share/info' \
- --mandir='/usr/share/man' \
- --with-rt-jar='no' \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --with-jni-library-path='/usr/lib/jni' \
- --without-kaffe-qt-awt \
- --without-kaffe-x-awt \
- --disable-nls
+CONFFLAGS := --infodir='/usr/share/info' --mandir='/usr/share/man' --with-rt-jar='no' \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --with-jni-library-path='/usr/lib/jni' \
+ --without-kaffe-qt-awt --without-kaffe-x-awt --disable-nls
prerms := $(patsubst %,debian/kaffe-%.prerm,$(SYSTEMS))
postinsts := $(patsubst %,debian/kaffe-%.postinst,$(SYSTEMS))
-ifneq ($(strip $(KAFFE_JIKES)),)
+# based on above values and overrides in rules.$arch files
+# setting the different configure options
+ifneq ($(strip $(COMPILER_JIKES)),)
CONFFLAGS += --with-jikes
endif
-ifneq ($(strip $(KAFFE_GCJ)),)
-CONFFLAGS += --enable-gcj
-else
-CONFFLAGS += --disable-gcj
+ifneq ($(strip $(COMPILER_ECJ)),)
+CONFFLAGS += --with-jikes=/usr/bin/ecj-bootstrap-gcj
+export JAVAC_FLAGS=-source 1.4 -nowarn -bootclasspath $(CURDIR)/build/jthreads/libraries/javalib/lib/
endif
ifeq ($(strip $(ENABLE_SOUND)),yes)
@@ -64,6 +53,8 @@
ifeq ($(strip $(INTRP_ENGINE)),yes)
CONFFLAGS += --with-engine=intrp
+else
+CONFFLAGS += --with-engine=jit3
endif
CFLAGS = -Wall -g
@@ -73,6 +64,7 @@
else
CFLAGS += -O2
endif
+
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
@@ -81,7 +73,7 @@
# DBS
#
export DH_COMPAT=3
-RELEASE = 1.1.5
+RELEASE = 1.1.6
TAR_DIR = kaffe-$(RELEASE)
# the dbs rules
include /usr/share/dbs/dbs-build.mk
@@ -94,9 +86,8 @@
endif
$(STAMP_DIR)/configure-jthreads: CONFFLAGS += --without-classpath-gtk-awt --disable-sound --without-alsa
-$(STAMP_DIR)/build-pthreads-profile $(STAMP_DIR)/build-pthreads: $(STAMP_DIR)/build-jthreads
-$(STAMP_DIR)/configure-pthreads-profile: CONFFLAGS += --with-staticvm --with-staticlib --with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar --disable-sound --with-profiling --enable-xprofiling
-$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar
+$(STAMP_DIR)/build-pthreads: $(STAMP_DIR)/build-jthreads
+$(STAMP_DIR)/configure-pthreads: CONFFLAGS += --with-rt-jar=$(CURDIR)/build/jthreads/libraries/javalib/rt.jar --enable-gtk-cairo --enable-jvmpi
configure: $(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS))
$(patsubst %,$(STAMP_DIR)/configure-%,$(SYSTEMS)): $(STAMP_DIR)/configure-%: $(patched)
@@ -110,9 +101,11 @@
dh_testdir
$(MAKE) -C build/$*
+
# Timeout changed 300->30, because some builds would otherwise take many
# hours due to bug in pthreads-enabled kaffe on some architectures
-$(MAKE) -C build/$* check TIMEOUT=30
+
mkdir -p $(@D)
touch $@
@@ -142,11 +135,13 @@
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
- # Remove javadoc and make it a symlink
- for i in $(SYSTEMS); do rm $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javadoc; ln -s ../../../../bin/gjdoc $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javadoc; done
+ # Remove javadoc and make it a symlink to gjdoc
+ for i in $(SYSTEMS); do install -m 755 $(CURDIR)/debian/wrappers/javadoc $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/javadoc; done
+ # Remove jar and make it a symlink to fastjar
+ for i in $(SYSTEMS); do rm $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/jar; ln -s ../../../../bin/fastjar $(CURDIR)/debian/install/usr/lib/kaffe/$$i/bin/jar; done
# install lintian overrides
- install -d $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/
- install -m 644 $(CURDIR)/debian/kaffe-pthreads-profile.lintian $(CURDIR)/debian/kaffe-pthreads-profile/usr/share/lintian/overrides/kaffe-pthreads-profile
+ install -d $(CURDIR)/debian/kaffe/usr/share/lintian/overrides/
+ install -m 644 $(CURDIR)/debian/kaffe.lintian $(CURDIR)/debian/kaffe/usr/share/lintian/overrides/kaffe
# Build architecture-independent files here.
binary-indep: build install
@@ -178,7 +173,7 @@
dh_installexamples -s
dh_installman -s
dh_link -s
- dh_strip -s -N kaffe-pthreads-profile
+ dh_strip -s
dh_compress -s
dh_fixperms -s
dh_installdeb -s
--- /cvsroot/pkg-java/kaffe/debian/rules.i386 2005/07/24 19:39:43 1.1
+++ /cvsroot/pkg-java/kaffe/debian/rules.i386 2005/09/23 16:28:33 1.2
@@ -1 +1 @@
-SYSTEMS := jthreads pthreads pthreads-profile
+INTRP_ENGINE = no
More information about the pkg-java-commits
mailing list