Author: nthykier-guest Date: 2010-04-21 21:41:20 +0000 (Wed, 21 Apr 2010) New Revision: 12190
Added: trunk/libreadline-java/debian/ trunk/libreadline-java/debian/README.source trunk/libreadline-java/debian/changelog trunk/libreadline-java/debian/clean trunk/libreadline-java/debian/compat trunk/libreadline-java/debian/control trunk/libreadline-java/debian/copyright trunk/libreadline-java/debian/libreadline-java-doc.README.test trunk/libreadline-java/debian/libreadline-java-doc.doc-base trunk/libreadline-java/debian/libreadline-java-doc.docs trunk/libreadline-java/debian/libreadline-java-doc.examples trunk/libreadline-java/debian/libreadline-java.README.Debian trunk/libreadline-java/debian/libreadline-java.docs trunk/libreadline-java/debian/libreadline-java.files trunk/libreadline-java/debian/libreadline-java.install trunk/libreadline-java/debian/libreadline-java.jlibs trunk/libreadline-java/debian/patches/ trunk/libreadline-java/debian/patches/add-editline-native.patch trunk/libreadline-java/debian/patches/add-editline.patch trunk/libreadline-java/debian/patches/correct-typo.patch trunk/libreadline-java/debian/patches/makefile-fix.patch trunk/libreadline-java/debian/patches/native-makefile.patch trunk/libreadline-java/debian/patches/series trunk/libreadline-java/debian/rules trunk/libreadline-java/debian/source/ trunk/libreadline-java/debian/source/format Log: Initial import of fixed libreadline-java. Added: trunk/libreadline-java/debian/README.source =================================================================== --- trunk/libreadline-java/debian/README.source (rev 0) +++ trunk/libreadline-java/debian/README.source 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,7 @@ +Source repack: + + The contrib/ dir has been removed because it contained + files that had no license and were not copyrighted by + the upstream author. + + -- Niels Thykier <[email protected]> Wed, 21 Apr 2010 23:23:00 +0200 Added: trunk/libreadline-java/debian/changelog =================================================================== --- trunk/libreadline-java/debian/changelog (rev 0) +++ trunk/libreadline-java/debian/changelog 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,233 @@ +libreadline-java (0.8.0.1+dfsg-1) UNRELEASED; urgency=low + + * New maintainer. (Closes: #577663) + * Bumped Standards-Versions to 3.8.4 + - Changed section to java. + - Added Homepage field. + * Converted to 3.0 (quilt) source format. + * Corrected doc-base section (it is now in Programming). + * Added missing ${misc:Depends}. + * Correct Build-Depends on libreadline-dev. (Closes: #553800) + * Added --as-needed to linker flags to avoid linking against unused + libraries. + * Updated the README.Debian in libreadline-java and removed the one + from the -doc package. + * Made the build use the correct Java during build. + * Linked the API against the system javadoc. + * Move install location to api from api-html to comply with the Java + Policy. + * Convert build to dh7 and bumped debhelper compat to 7. + + -- Niels Thykier <[email protected]> Mon, 19 Apr 2010 22:48:09 +0200 + +libreadline-java (0.8.0.1-8.2) unstable; urgency=low + + * Non-maintainer upload + * also include /usr/lib/jvm/default-java/include/linux (closes: #559991) + + -- Rene Engelhard <[email protected]> Fri, 22 Jan 2010 21:46:59 +0100 + +libreadline-java (0.8.0.1-8.1) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend on default-jdk-builddep, not building anymore on arm, alpha, hppa. + Closes: #477885. + + -- Matthias Klose <[email protected]> Sat, 10 May 2008 16:07:57 +0200 + +libreadline-java (0.8.0.1-8) unstable; urgency=low + + * Change from using gcjh to gjavah, since gcjh has been removed + (closes: #423992). + * Switched from setting $DH_COMPAT to using debian/compat instead. + * Removed blank lines from the end of the doc-base file, which seem to be + confusing lintian. + * Bump standards-version to 3.7.2.2 (no changes required). + + -- Ben Burton <[email protected]> Sat, 19 May 2007 15:37:47 +1000 + +libreadline-java (0.8.0.1-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Drop Build-Depends on libgcj-dev. (Closes: #359737) + + -- Mohammed Adnène Trojette <[email protected]> Sat, 5 Aug 2006 20:11:01 +0200 + +libreadline-java (0.8.0.1-7) unstable; urgency=low + + * Build-depends on java-gcj-compat-dev, so that the recently relocated + jni.h can be found (closes: #371060). + + -- Ben Burton <[email protected]> Thu, 8 Jun 2006 08:19:38 +1000 + +libreadline-java (0.8.0.1-6) unstable; urgency=low + + * Rebuilt using gcj-4.1; updated build scripts to reflect the new locations + of JNI headers, updated build-depends accordingly. + * Switched to DH_COMPAT=5 and updated build-depends accordingly. + * Updated standards-version to 3.7.2.0 (no changes required). + + -- Ben Burton <[email protected]> Wed, 7 Jun 2006 07:49:43 +1000 + +libreadline-java (0.8.0.1-5) unstable; urgency=low + + * Rebuilt against libreadline5 (closes: #326334). Build-depends on + libreadline4-dev changed to (libreadline5-dev | libreadline-dev). + * Bumped standards-version to 3.6.2.1 (no changes required). + + -- Ben Burton <[email protected]> Sat, 3 Sep 2005 13:14:46 +1000 + +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, + 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 + own (closes: #240264). + * Bumped standards-version to 3.6.1. + + -- Ben Burton <[email protected]> Fri, 2 Apr 2004 23:07:54 +1000 + +libreadline-java (0.8.0.1-1) unstable; urgency=low + + * Added changes from development CVS to implement getVar() and setVar(), + which are required for proper integration with jython (see #184838 + for details). Also enhanced these routines for compatibility with + BSD editline. + * Bumped the upstream source version to make it clear that new + functionality has been added. + + -- Ben Burton <[email protected]> Wed, 27 Aug 2003 13:50:38 +1000 + +libreadline-java (0.8.0-2) unstable; urgency=low + + * Uses default gcj, not gcj-3.2 (closes: #201454). + * Bumped standards-version to 3.6.0. + * Installs JNI module in /usr/lib/jni according to java policy. + + -- Ben Burton <[email protected]> Tue, 19 Aug 2003 16:42:36 -0500 + +libreadline-java (0.8.0-1) unstable; urgency=low + + * New upstream release. + * Added defaults for virtual package dependencies. + * Minor changes for command-line in README.test. + * New maintainer email address. + * Bumped standards-version to 3.5.8. + + -- Ben Burton <[email protected]> Wed, 29 Jan 2003 12:31:02 +1100 + +libreadline-java (0.7.3-2) unstable; urgency=low + + * Implement getHistory() manually under Editline instead of using the + underlying history_list() call which libedit does not support + (closes: Bug#166091). + + -- Ben Burton <[email protected]> Thu, 24 Oct 2002 09:29:29 +1000 + +libreadline-java (0.7.3-1) unstable; urgency=high + + * New upstream release. + * Now builds using gcj-3.2 since this is available for enough architectures. + * Updated to reflect latest java policy. + * Moved examples from libreadline-java to libreadline-java-doc. + * Bumped standards-version to 3.5.7. + + -- Ben Burton <[email protected]> Thu, 3 Oct 2002 16:36:21 +1000 + +libreadline-java (0.7.0-2) unstable; urgency=high + + * Updated build procedure to reflect relocation of kaffe bootstrap classes. + Now either location should be fine. + * Modified build-depends to ensure we're not building under a broken jikes. + + -- Ben Burton <[email protected]> Fri, 19 Apr 2002 20:17:45 +1000 + +libreadline-java (0.7.0-1) unstable; urgency=low + + * New upstream release. + + -- Ben Burton <[email protected]> Mon, 11 Feb 2002 14:47:23 +1100 + +libreadline-java (0.6-1) unstable; urgency=low + + * New upstream release. + * Merged libeditline-java and libreadline-java into a single package. + + -- Ben Burton <[email protected]> Sun, 9 Dec 2001 10:11:21 -0600 + +libreadline-java (0.5-8) unstable; urgency=low + + * Build uses gcj over kaffe when both are available. + + -- Ben Burton <[email protected]> Wed, 7 Nov 2001 19:40:05 -0600 + +libreadline-java (0.5-7) unstable; urgency=low + + * Changed package name to conform to new java policy. + * Now builds with either gcj or kaffe since neither compiler is + provided for all architectures. + + -- Ben Burton <[email protected]> Sat, 27 Oct 2001 13:24:22 -0500 + +lib-readline-java (0.5-6) unstable; urgency=low + + * Builds using gcj instead of jikes and kaffe. + + -- Ben Burton <[email protected]> Sat, 13 Oct 2001 18:39:43 -0500 + +lib-readline-java (0.5-5) unstable; urgency=low + + * Split API docs into separate package lib-readline-java-doc that + lib-editline-java can refer to also. + * Tidied up in debian/. + + -- Ben Burton <[email protected]> Fri, 31 Aug 2001 15:25:31 -0500 + +lib-readline-java (0.5-4) unstable; urgency=low + + * Cleaned up debian/rules. + + -- Ben Burton <[email protected]> Mon, 13 Aug 2001 15:27:09 +1000 + +lib-readline-java (0.5-3) unstable; urgency=low + + * Upped standards-version to 3.5.6. + + -- Ben Burton <[email protected]> Sun, 5 Aug 2001 10:07:00 +1000 + +lib-readline-java (0.5-2) unstable; urgency=low + + * Updated copyright file to note that the underlying libreadline is GPLed. + + -- Ben Burton <[email protected]> Mon, 2 Jul 2001 10:39:07 -0500 + +lib-readline-java (0.5-1) unstable; urgency=low + + * Initial Release (closes: Bug#102928). + + -- Ben Burton <[email protected]> Sat, 30 Jun 2001 18:03:06 -0500 + +Local variables: +mode: debian-changelog +End: Added: trunk/libreadline-java/debian/clean =================================================================== --- trunk/libreadline-java/debian/clean (rev 0) +++ trunk/libreadline-java/debian/clean 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1 @@ +lib*.so* Added: trunk/libreadline-java/debian/compat =================================================================== --- trunk/libreadline-java/debian/compat (rev 0) +++ trunk/libreadline-java/debian/compat 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1 @@ +7 Added: trunk/libreadline-java/debian/control =================================================================== --- trunk/libreadline-java/debian/control (rev 0) +++ trunk/libreadline-java/debian/control 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,41 @@ +Source: libreadline-java +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Niels Thykier <[email protected]> +Build-Depends: debhelper (>= 7.0.50~), default-jdk, libedit-dev, libreadline-dev, default-jdk-doc, + javahelper +Standards-Version: 3.8.4 +Homepage: http://java-readline.sourceforge.net/ + +Package: libreadline-java +Architecture: any +Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, + ${shlibs:Depends}, ${misc:Depends} +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) +Description: GNU readline and BSD editline wrappers for Java + Included is the Java package org.gnu.readline which provides the GNU + readline and BSD editline libraries for Java. Note that this is NOT a + pure Java implementation; it merely contains JNI wrappers for the standard + system libraries. + . + BSD editline resembles GNU readline but is under a more relaxed license. + In some cases it can be used as a drop-in replacement for GNU readline + when licensing issues prevent GNU readline from being used. + . + The API documentation and examples can be found in libreadline-java-doc. + +Package: libreadline-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Recommends: w3m | www-browser, default-jdk-doc +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) +Description: API docs for readline/editline wrappers for Java + This package provides the API documentation and examples for the + GNU readline and BSD editline wrappers for Java. The wrappers themselves + can be found in package libreadline-java. Added: trunk/libreadline-java/debian/copyright =================================================================== --- trunk/libreadline-java/debian/copyright (rev 0) +++ trunk/libreadline-java/debian/copyright 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,43 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: Java-Readline +Source: http://java-readline.sourceforge.net/ +Disclaimer: + + The Java wrappers provided by this package give you the option of + linking with either the GNU readline or the BSD editline libraries. Be + aware however that GNU readline is distributed under the terms of the + GNU General Public License, so any program using these wrappers that is + not GPL-compatible will need to initialise the wrapper classes to link + with BSD editline instead. + + Please refer to copyright file of libreadline for which version of the + GNU General Public License it is licensed under. + +Copyright: 1998-2001, Bernhard Bablok <[email protected]> +License: LGPL-2.0+ + +Files: src/native/getline.[ch] +Copyright: 1991-1994, Chris Thewalt <[email protected]> +License: Other + + Permission to use, copy, modify, and distribute this software + for any purpose and without fee is hereby granted, provided + that the above copyright notices appear in all copies and that both the + copyright notice and this permission notice appear in supporting + documentation. This software is provided "as is" without express or + implied warranty. + +License: LGPL-2.0+ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2 of the License or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + On Debian systems, the complete texts of the GNU Lesser General Public + License version 2.0 can be found in `/usr/share/common-licenses/LGPL-2'. Added: trunk/libreadline-java/debian/libreadline-java-doc.README.test =================================================================== --- trunk/libreadline-java/debian/libreadline-java-doc.README.test (rev 0) +++ trunk/libreadline-java/debian/libreadline-java-doc.README.test 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,26 @@ +libreadline-java Examples +------------------------- + +The class test.ReadlineTest illustrates the usage of the Java readline +wrappers. See the API documentation for further details. + +To run this test, simply execute the class test.ReadlineTest (found +beneath this directory), making sure you have the readline wrappers +(/usr/share/java/libreadline-java-<version>.jar) in your classpath. + +To explicitly force ReadlineTest to link with your choice of GNU readline, +BSD editline or pure Java (no readline/editline support), pass one of +the following three sets of command-line arguments respectively: + + /etc/inputrc GnuReadline + /etc/inputrc Editline + /etc/inputrc PureJava + +For example, running + + java -classpath .:/usr/share/java/libreadline-java.jar test.ReadlineTest \ + /etc/inputrc Editline + +from this directory will run ReadlineTest linked with BSD editline. + + -- Ben Burton <[email protected]>, Wed, 29 Jan 2003 12:31:02 +1100 Added: trunk/libreadline-java/debian/libreadline-java-doc.doc-base =================================================================== --- trunk/libreadline-java/debian/libreadline-java-doc.doc-base (rev 0) +++ trunk/libreadline-java/debian/libreadline-java-doc.doc-base 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,10 @@ +Document: libreadline-java-doc +Title: Java-Readline Library Documentation +Author: Bernhard Bablok <[email protected]> +Abstract: This manual contains the API documentation for libreadline-java + which provides Java wrappers for GNU readline and BSD editline. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libreadline-java-doc/api/index.html +Files: /usr/share/doc/libreadline-java-doc/api/*.html Added: trunk/libreadline-java/debian/libreadline-java-doc.docs =================================================================== --- trunk/libreadline-java/debian/libreadline-java-doc.docs (rev 0) +++ trunk/libreadline-java/debian/libreadline-java-doc.docs 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,5 @@ +api +README +README.1st +NEWS +TODO Added: trunk/libreadline-java/debian/libreadline-java-doc.examples =================================================================== --- trunk/libreadline-java/debian/libreadline-java-doc.examples (rev 0) +++ trunk/libreadline-java/debian/libreadline-java-doc.examples 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,3 @@ +build/test +src/test +debian/libreadline-java-doc.README.test Added: trunk/libreadline-java/debian/libreadline-java.README.Debian =================================================================== --- trunk/libreadline-java/debian/libreadline-java.README.Debian (rev 0) +++ trunk/libreadline-java/debian/libreadline-java.README.Debian 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,12 @@ +libreadline-java for Debian +--------------------------- + +The GNU readline and BSD editline wrappers are stored in the archive +/usr/share/java/libreadline-java-<version>.jar. + +Note that the test classes, although described in the API documentation, +are not included in the above jar. They can instead be found in the +directory /usr/share/doc/libreadline-java-doc/examples/, also provided +by debian package libreadline-java-doc. + + -- Ben Burton <[email protected]>, Thu, 3 Oct 2002 16:36:21 +1000 Added: trunk/libreadline-java/debian/libreadline-java.docs =================================================================== --- trunk/libreadline-java/debian/libreadline-java.docs (rev 0) +++ trunk/libreadline-java/debian/libreadline-java.docs 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,4 @@ +README +README.1st +NEWS +TODO Added: trunk/libreadline-java/debian/libreadline-java.files =================================================================== --- trunk/libreadline-java/debian/libreadline-java.files (rev 0) +++ trunk/libreadline-java/debian/libreadline-java.files 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,2 @@ +usr/lib/jni +usr/share/java/libreadline-java*.jar Added: trunk/libreadline-java/debian/libreadline-java.install =================================================================== --- trunk/libreadline-java/debian/libreadline-java.install (rev 0) +++ trunk/libreadline-java/debian/libreadline-java.install 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,2 @@ +libJavaReadline.so usr/lib/jni/ +libJavaEditline.so usr/lib/jni/ Added: trunk/libreadline-java/debian/libreadline-java.jlibs =================================================================== --- trunk/libreadline-java/debian/libreadline-java.jlibs (rev 0) +++ trunk/libreadline-java/debian/libreadline-java.jlibs 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1 @@ +libreadline-java.jar Added: trunk/libreadline-java/debian/patches/add-editline-native.patch =================================================================== --- trunk/libreadline-java/debian/patches/add-editline-native.patch (rev 0) +++ trunk/libreadline-java/debian/patches/add-editline-native.patch 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,120 @@ +Description: Updates the native part of the library to handle Editline. + +--- libreadline-java-0.8.0.1.orig/src/native/org_gnu_readline_Readline.c ++++ libreadline-java-0.8.0.1/src/native/org_gnu_readline_Readline.c +@@ -70,6 +70,14 @@ static int undefinedInternalInt = 0; + static char* undefinedInternalString = NULL; + static char undefinedInternalChar = '0'; + ++/* ++ * Some variables are available with editline but are not declared in ++ * the appropriate headers. ++ */ ++#ifdef JavaEditline ++extern int rl_inhibit_completion; ++#endif ++ + #ifdef JavaReadline + static int* globalIntegerInternals[] = { + &rl_readline_version, +@@ -145,8 +153,8 @@ static int* globalIntegerInternals[] = { + &undefinedInternalInt, /* &rl_readline_state, */ + &undefinedInternalInt, /* &rl_editing_mode, */ + &undefinedInternalInt, /* &rl_insert_mode, */ +- &undefinedInternalInt, /* &rl_point, */ +- &undefinedInternalInt, /* &rl_end, */ ++ &rl_point, ++ &rl_end, + &undefinedInternalInt, /* &rl_mark, */ + &undefinedInternalInt, /* &rl_done, */ + &undefinedInternalInt, /* &rl_pending_input, */ +@@ -161,34 +169,34 @@ static int* globalIntegerInternals[] = { + &undefinedInternalInt, /* &rl_filename_completion_desired, */ + &undefinedInternalInt, /* &rl_filename_quoting_desired, */ + &undefinedInternalInt, /* &rl_attempted_completion_over, */ +- &undefinedInternalInt, /* &rl_completion_type, */ +- &undefinedInternalInt, /* &rl_completion_append_character, */ ++ &rl_completion_type, ++ &rl_completion_append_character, + &undefinedInternalInt, /* &rl_completion_suppress_append, */ +- &undefinedInternalInt, /* &rl_completion_query_items, */ ++ &rl_completion_query_items, + &undefinedInternalInt, /* &rl_completion_mark_symlink_dirs, */ + &undefinedInternalInt, /* &rl_ignore_completion_duplicates, */ +- &undefinedInternalInt, /* &rl_inhibit_completion, */ ++ &rl_inhibit_completion, + +- &undefinedInternalInt, /* &history_base, */ +- &undefinedInternalInt, /* &history_length, */ ++ &history_base, ++ &history_length, + &undefinedInternalInt, /* &history_max_entries, */ + &undefinedInternalInt, /* &history_quotes_inhibit_expansion, */ + NULL + }; + + static char** globalStringInternals[] = { +- &undefinedInternalString, /* const &rl_library_version, */ +- &undefinedInternalString, /* const &rl_readline_name, */ ++ /* const */ &rl_library_version, ++ /* const */ &rl_readline_name, + &undefinedInternalString, /* &rl_prompt, */ +- &undefinedInternalString, /* &rl_line_buffer, */ ++ &rl_line_buffer, + &undefinedInternalString, /* const &rl_terminal_name, */ + &undefinedInternalString, /* &rl_executing_macro, */ +- &undefinedInternalString, /* const &rl_basic_word_break_characters, */ +- &undefinedInternalString, /* const &rl_completer_word_break_characters, */ +- &undefinedInternalString, /* const &rl_completer_quote_characters, */ ++ /* const */ &rl_basic_word_break_characters, ++ /* const */ &rl_completer_word_break_characters, ++ /* const */ &rl_completer_quote_characters, + &undefinedInternalString, /* const &rl_basic_quote_characters, */ + &undefinedInternalString, /* const &rl_filename_quote_characters, */ +- &undefinedInternalString, /* const &rl_special_prefixes, */ ++ /* const */ &rl_special_prefixes, + + &undefinedInternalString, /* &history_word_delimiters, */ + &undefinedInternalString, /* &history_no_expand_chars, */ +@@ -814,14 +822,17 @@ JNIEXPORT jstring JNICALL + + /* save old value */ + +- oldValue = strdup(*(globalStringInternals[(int) jindex])); +- if (!oldValue) { +- jclass newExcCls; +- newExcCls = (*env)->FindClass(env,"java/lang/OutOfMemoryError"); +- if (newExcCls != NULL) +- (*env)->ThrowNew(env,newExcCls,""); +- return; +- } ++ if (*(globalStringInternals[(int) jindex])) { ++ oldValue = strdup(*(globalStringInternals[(int) jindex])); ++ if (!oldValue) { ++ jclass newExcCls; ++ newExcCls = (*env)->FindClass(env,"java/lang/OutOfMemoryError"); ++ if (newExcCls != NULL) ++ (*env)->ThrowNew(env,newExcCls,""); ++ return; ++ } ++ } else ++ oldValue = NULL; + + /* read new value from argument */ + +@@ -847,9 +858,12 @@ JNIEXPORT jstring JNICALL + + /* return old value */ + +- ucs2utf(oldValue); +- free(oldValue); +- return (*env)->NewStringUTF(env,buffer); ++ if (oldValue) { ++ ucs2utf(oldValue); ++ free(oldValue); ++ return (*env)->NewStringUTF(env,buffer); ++ } else ++ return NULL; + } + + /* -------------------------------------------------------------------------- */ Added: trunk/libreadline-java/debian/patches/add-editline.patch =================================================================== --- trunk/libreadline-java/debian/patches/add-editline.patch (rev 0) +++ trunk/libreadline-java/debian/patches/add-editline.patch 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,244 @@ +Description: Adds Editline to Readline.java + +--- a/src/org/gnu/readline/Readline.java ++++ b/src/org/gnu/readline/Readline.java +@@ -79,13 +79,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstString RL_LIBRARY_VERSION = + new ReadlineConstString(0, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -95,13 +96,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstString RL_READLINE_NAME = + new ReadlineConstString(1, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -127,13 +129,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstString RL_LINE_BUFFER = + new ReadlineConstString(3, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -175,13 +178,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstString RL_BASIC_WORD_BREAK_CHARACTERS = + new ReadlineConstString(6, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -191,13 +195,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstString RL_COMPLETER_WORD_BREAK_CHARACTERS = + new ReadlineConstString(7, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -207,13 +212,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstString RL_COMPLETER_QUOTE_CHARACTERS = + new ReadlineConstString(8, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -255,13 +261,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstString RL_SPECIAL_PREFIXES = + new ReadlineConstString(11, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -398,13 +405,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstInt RL_POINT = + new ReadlineConstInt(5, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -414,13 +422,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstInt RL_END = + new ReadlineConstInt(6, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -654,13 +663,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstInt RL_COMPLETION_TYPE = + new ReadlineConstInt(21, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -670,13 +680,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstInt RL_COMPLETION_APPEND_CHARACTER = + new ReadlineConstInt(22, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -702,13 +713,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstInt RL_COMPLETION_QUERY_ITEMS = + new ReadlineConstInt(24, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -750,13 +762,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstInt RL_INHIBIT_COMPLETION = + new ReadlineConstInt(27, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -766,13 +779,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstInt HISTORY_BASE = + new ReadlineConstInt(28, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** +@@ -782,13 +796,14 @@ public class Readline { + <p>Supporting implementations: + <ul> + <li>GNU-Readline</li> ++ <li>Editline</li> + </ul> + </p> + */ + + public final static ReadlineConstInt HISTORY_LENGTH = + new ReadlineConstInt(29, new ReadlineLibrary[] +- {ReadlineLibrary.GnuReadline}); ++ {ReadlineLibrary.GnuReadline, ReadlineLibrary.Editline}); + + + /** Added: trunk/libreadline-java/debian/patches/correct-typo.patch =================================================================== --- trunk/libreadline-java/debian/patches/correct-typo.patch (rev 0) +++ trunk/libreadline-java/debian/patches/correct-typo.patch 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,13 @@ +Description: Correct a typo. + +--- libreadline-java-0.8.0.1.orig/src/test/ReadlineTest.java ++++ libreadline-java-0.8.0.1/src/test/ReadlineTest.java +@@ -114,7 +114,7 @@ public class ReadlineTest { + String version = Readline.getVar(Readline.RL_LIBRARY_VERSION); + System.out.println("Readline-Version: " + version); + } catch (UnsupportedEncodingException enc) { +- System.err.println("Could not query libarary version"); ++ System.err.println("Could not query library version"); + System.exit(0); + } + Added: trunk/libreadline-java/debian/patches/makefile-fix.patch =================================================================== --- trunk/libreadline-java/debian/patches/makefile-fix.patch (rev 0) +++ trunk/libreadline-java/debian/patches/makefile-fix.patch 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,30 @@ +Description: Make the top level Makefile use correct java tools + and link against system javadoc. + +--- libreadline-java-0.8.0.1.orig/Makefile ++++ libreadline-java-0.8.0.1/Makefile +@@ -86,10 +86,10 @@ RPM_BASE = `pwd`/$(BUILDDIR)/ + world : jar build-native + + jar: build-java +- cd $(BUILDDIR) ; jar -cvmf ../$(MF_STUB) ../$(JAR) * ++ cd $(BUILDDIR) ; $(JAVA_HOME)/bin/jar -cvf ../$(JAR) org + + $(JAR): +- cd $(BUILDDIR) ; jar -cvmf ../$(MF_STUB) ../$(JAR) * ++ cd $(BUILDDIR) ; $(JAVA_HOME)/bin/jar -cvf ../$(JAR) org + + build-java: $(BUILDDIR) + cd src ; $(MAKE) JAVAC="$(JAVAC)" JC_FLAGS="$(JC_FLAGS)" java +@@ -99,9 +99,9 @@ build-native: + JAVANATINC="$(JAVANATINC)" native + + apidoc: $(APIDIR) +- javadoc -sourcepath src -d $(APIDIR) -windowtitle $(WTITLE) \ ++ $(JAVA_HOME)/bin/javadoc -sourcepath src -d $(APIDIR) -windowtitle $(WTITLE) \ + -doctitle $(DTITLE) -footer $(DFOOTER) -header $(DHEADER) \ +- -bottom $(DBOTTOM) \ ++ -bottom $(DBOTTOM) -link /usr/share/doc/default-jdk-doc/api \ + -version -author org.gnu.readline test + + install: jar build-native apidoc Added: trunk/libreadline-java/debian/patches/native-makefile.patch =================================================================== --- trunk/libreadline-java/debian/patches/native-makefile.patch (rev 0) +++ trunk/libreadline-java/debian/patches/native-makefile.patch 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,31 @@ +Description: Fix the native Makefile to use correct java and read LDFLAGS. + +--- libreadline-java-0.8.0.1.orig/src/native/Makefile ++++ libreadline-java-0.8.0.1/src/native/Makefile +@@ -44,7 +44,7 @@ LIB_PRE := + LIB_EXT := dll + CFLAGS=-DWIN32=$(WIN32) -D__IBMC__ + else +-INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC) ++INCLUDES = -I $(JAVAINCLUDE) -I $(JAVAINCLUDE)/linux -I $(JAVANATINC) -I $(JAVANATINC)/linux + LIBPATH = -L/usr/lib/termcap + JavaReadline_LIBS = -lreadline -ltermcap -lhistory + JavaEditline_LIBS = -ledit -ltermcap +@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32)) + $(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \ + $(OBJECTS) -W1,-e,_readline_i...@12 + else +- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ ++ $(CC) $(LDFLAGS) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ + endif + endif + +@@ -110,7 +110,7 @@ org_gnu_readline_Readline.$(OBJ_EXT): or + -c org_gnu_readline_Readline.c + + org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class +- javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline ++ $(JAVA_HOME)/bin/javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline + touch org_gnu_readline_Readline.h + + clean: Added: trunk/libreadline-java/debian/patches/series =================================================================== --- trunk/libreadline-java/debian/patches/series (rev 0) +++ trunk/libreadline-java/debian/patches/series 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,5 @@ +add-editline.patch +add-editline-native.patch +correct-typo.patch +native-makefile.patch +makefile-fix.patch Added: trunk/libreadline-java/debian/rules =================================================================== --- trunk/libreadline-java/debian/rules (rev 0) +++ trunk/libreadline-java/debian/rules 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1,31 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +egdir = debian/libreadline-java-doc/usr/share/doc/libreadline-java-doc/examples +export JAVA_HOME:=/usr/lib/jvm/default-java + +%: + dh $@ --with javahelper + +override_dh_auto_build: + $(MAKE) JAVAC=$(JAVA_HOME)/bin/javac JC_FLAGS="-source 1.4 -target 1.4" CC=gcc \ + LDFLAGS="-Wl,--no-undefined -Wl,--as-needed" JAVAINCLUDE=$(JAVA_HOME)/include \ + JAVANATINC=$(JAVA_HOME)/include \ + T_LIBS="JavaReadline JavaEditline" jar build-native apidoc + +override_dh_auto_install: + # Skip auto-install - it causes a rebuild and we do not need it. + +override_dh_auto_test: + # Skip tests - they dont work. + +override_dh_installexamples: + dh_installexamples + # Tidy up the examples directory. + rm $(egdir)/test/Makefile + mv $(egdir)/libreadline-java-doc.README.test $(egdir)/README.test + Property changes on: trunk/libreadline-java/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: trunk/libreadline-java/debian/source/format =================================================================== --- trunk/libreadline-java/debian/source/format (rev 0) +++ trunk/libreadline-java/debian/source/format 2010-04-21 21:41:20 UTC (rev 12190) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
