[libreadline-java] 15/21: Imported Debian patch 0.8.0.1+dfsg-1
Tony Mancill
tmancill at moszumanska.debian.org
Sat Mar 22 16:49:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository libreadline-java.
commit ef7eed6baaa05ed93aacd17902eefd249f0b3563
Merge: e4f6542 e769e8f
Author: Niels Thykier <niels at thykier.net>
Date: Wed Apr 21 23:50:08 2010 +0200
Imported Debian patch 0.8.0.1+dfsg-1
Makefile | 4 +-
api-html/allclasses-frame.html | 41 -
api-html/allclasses-noframe.html | 41 -
api-html/constant-values.html | 153 --
api-html/deprecated-list.html | 121 --
api-html/help-doc.html | 176 --
api-html/index-all.html | 546 -----
api-html/index.html | 25 -
api-html/org/gnu/readline/Readline.html | 2427 ----------------------
api-html/org/gnu/readline/ReadlineCompleter.html | 277 ---
api-html/org/gnu/readline/ReadlineLibrary.html | 342 ---
api-html/org/gnu/readline/ReadlineReader.html | 479 -----
api-html/org/gnu/readline/package-frame.html | 48 -
api-html/org/gnu/readline/package-summary.html | 157 --
api-html/org/gnu/readline/package-tree.html | 139 --
api-html/overview-frame.html | 45 -
api-html/overview-summary.html | 139 --
api-html/overview-tree.html | 139 --
api-html/package-list | 2 -
api-html/packages.html | 32 -
api-html/serialized-form.html | 121 --
api-html/stylesheet.css | 29 -
api-html/test/ReadlineTest.html | 270 ---
api-html/test/TestCompleter.html | 272 ---
api-html/test/package-frame.html | 35 -
api-html/test/package-summary.html | 141 --
api-html/test/package-tree.html | 133 --
contrib/bsh/BshCompleter.java | 38 -
contrib/bsh/Interpreter.java | 1002 ---------
contrib/bsh/Interpreter.java.diff | 79 -
contrib/bsh/README | 23 -
contrib/jpython/README | 10 -
contrib/jpython/ReadlineConsole.java | 46 -
contrib/jpython/jpython.diff | 22 -
contrib/jpython/jpython.java | 272 ---
contrib/jpython/jython-install.txt | 64 -
contrib/jscheme/SilkCompleter.java | 64 -
contrib/win32/JavaGetline.dll | Bin 47622 -> 0 bytes
debian/README.source | 7 +
debian/changelog | 25 +
debian/clean | 1 +
debian/compat | 2 +-
debian/control | 22 +-
debian/copyright | 58 +-
debian/libreadline-java-doc.README.Debian | 15 -
debian/libreadline-java-doc.README.test | 2 +-
debian/libreadline-java-doc.doc-base | 6 +-
debian/libreadline-java-doc.docs | 2 +-
debian/libreadline-java.README.Debian | 5 -
debian/libreadline-java.install | 2 +
debian/libreadline-java.jlibs | 1 +
debian/patches/add-editline-native.patch | 120 ++
debian/patches/add-editline.patch | 244 +++
debian/patches/correct-typo.patch | 13 +
debian/patches/makefile-fix.patch | 30 +
debian/patches/native-makefile.patch | 31 +
debian/patches/series | 5 +
debian/rules | 105 +-
debian/source/format | 1 +
src/native/Makefile | 4 +-
src/native/org_gnu_readline_Readline.c | 66 +-
src/org/gnu/readline/Readline.java | 45 +-
src/test/ReadlineTest.java | 2 +-
63 files changed, 598 insertions(+), 8170 deletions(-)
diff --cc debian/README.source
index 0000000,0000000..73b7141
new file mode 100644
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,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 <niels at thykier.net> Wed, 21 Apr 2010 23:23:00 +0200
diff --cc debian/changelog
index d1cc986,0000000..a1097c4
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,211 -1,0 +1,236 @@@
++libreadline-java (0.8.0.1+dfsg-1) unstable; 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.
++ * Updated debian/copyright.
++ * Repacked to remove files without license and not from the upstream
++ author.
++
++ -- Niels Thykier <niels at thykier.net> Wed, 21 Apr 2010 23:50:08 +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 <rene at debian.org> 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 <doko at debian.org> 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 <bab at debian.org> 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 <adn+deb at diwi.org> 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 <bab at debian.org> 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 <bab at debian.org> 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 <bab at debian.org> 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 <bab at debian.org> 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 <bab at debian.org> 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 <bab at debian.org> 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 <bab at debian.org> 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 <bab at debian.org> 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 <bab at debian.org> 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 <benb at acm.org> 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 <benb at acm.org> 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 <benb at acm.org> Fri, 19 Apr 2002 20:17:45 +1000
+
+libreadline-java (0.7.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Ben Burton <benb at acm.org> 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 <benb at acm.org> 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 <benb at acm.org> 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 <benb at acm.org> 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 <benb at acm.org> 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 <benb at acm.org> Fri, 31 Aug 2001 15:25:31 -0500
+
+lib-readline-java (0.5-4) unstable; urgency=low
+
+ * Cleaned up debian/rules.
+
+ -- Ben Burton <benb at acm.org> 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 <benb at acm.org> 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 <benb at acm.org> Mon, 2 Jul 2001 10:39:07 -0500
+
+lib-readline-java (0.5-1) unstable; urgency=low
+
+ * Initial Release (closes: Bug#102928).
+
+ -- Ben Burton <benb at acm.org> Sat, 30 Jun 2001 18:03:06 -0500
+
+Local variables:
+mode: debian-changelog
+End:
diff --cc debian/clean
index 0000000,0000000..e751bcd
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,1 @@@
++lib*.so*
diff --cc debian/compat
index 7ed6ff8,0000000..7f8f011
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++7
diff --cc debian/control
index febbb69,0000000..65395c1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,38 -1,0 +1,42 @@@
+Source: libreadline-java
- Section: libs
++Section: java
+Priority: optional
- Maintainer: Ben Burton <bab at debian.org>
- Build-Depends: debhelper (>= 5.0.0), fastjar, gcj (>= 4:4.1.0), default-jdk-builddep, libedit-dev, libreadline5-dev | libreadline-dev
- Standards-Version: 3.7.2.2
++Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
++Uploaders: Niels Thykier <niels at thykier.net>
++DM-Upload-Allowed: yes
++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
- Section: libs
- Depends: ${shlibs:Depends}, gij | java1-runtime | java2-runtime
++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 the debian package
- libreadline-java-doc.
++ The API documentation and examples can be found in libreadline-java-doc.
+
+Package: libreadline-java-doc
+Architecture: all
+Section: doc
- Recommends: w3m | www-browser
++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.
diff --cc debian/copyright
index 78c603a,0000000..0e36c27
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,23 -1,0 +1,43 @@@
- This package was debianized by Ben Burton <bab at debian.org> on
- Sat, 30 Jun 2001 18:03:06 -0500.
++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.
+
- It was downloaded from http://java-readline.sourceforge.net/.
++Copyright: 1998-2001, Bernhard Bablok <mail at bablokb.de>
++License: LGPL-2.0+
+
- Upstream Author: Bernhard Bablok <mail at bablokb.de>
++Files: src/native/getline.[ch]
++Copyright: 1991-1994, Chris Thewalt <thewalt at ce.berkeley.edu>
++License: Other
+
- Copyright:
++ 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.
+
- You are free to distribute this software under the terms of
- the GNU Lesser General Public License.
-
- 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.
-
- On Debian systems, the complete texts of the GNU Lesser General Public
- License and the GNU General Public License can be found in files
- /usr/share/common-licenses/LGPL and /usr/share/common-licenses/GPL
- respectively.
++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'.
diff --cc debian/libreadline-java-doc.README.test
index 9069f1c,0000000..aba5b51
mode 100644,000000..100644
--- a/debian/libreadline-java-doc.README.test
+++ b/debian/libreadline-java-doc.README.test
@@@ -1,26 -1,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) on your classpath.
++(/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 <bab at debian.org>, Wed, 29 Jan 2003 12:31:02 +1100
diff --cc debian/libreadline-java-doc.doc-base
index c7e92a0,0000000..7a64ed4
mode 100644,000000..100644
--- a/debian/libreadline-java-doc.doc-base
+++ b/debian/libreadline-java-doc.doc-base
@@@ -1,10 -1,0 +1,10 @@@
+Document: libreadline-java-doc
+Title: Java-Readline Library Documentation
+Author: Bernhard Bablok <mail at bablokb.de>
+Abstract: This manual contains the API documentation for libreadline-java
+ which provides Java wrappers for GNU readline and BSD editline.
- Section: Apps/Programming
++Section: Programming
+
+Format: HTML
- Index: /usr/share/doc/libreadline-java-doc/api-html/index.html
- Files: /usr/share/doc/libreadline-java-doc/api-html/*.html
++Index: /usr/share/doc/libreadline-java-doc/api/index.html
++Files: /usr/share/doc/libreadline-java-doc/api/*.html
diff --cc debian/libreadline-java-doc.docs
index b39de68,0000000..0ca1004
mode 100644,000000..100644
--- a/debian/libreadline-java-doc.docs
+++ b/debian/libreadline-java-doc.docs
@@@ -1,5 -1,0 +1,5 @@@
- api-html
++api
+README
+README.1st
+NEWS
+TODO
diff --cc debian/libreadline-java.README.Debian
index 03b8798,0000000..8914d3d
mode 100644,000000..100644
--- a/debian/libreadline-java.README.Debian
+++ b/debian/libreadline-java.README.Debian
@@@ -1,17 -1,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.
+
- The classes themselves can be found in package org.gnu.readline.
-
- The API documentation is in the debian package libreadline-java-doc, and
- once installed can be found in /usr/share/doc/libreadline-java-doc/api-html/.
-
+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 <bab at debian.org>, Thu, 3 Oct 2002 16:36:21 +1000
diff --cc debian/libreadline-java.install
index 0000000,0000000..01f8145
new file mode 100644
--- /dev/null
+++ b/debian/libreadline-java.install
@@@ -1,0 -1,0 +1,2 @@@
++libJavaReadline.so usr/lib/jni/
++libJavaEditline.so usr/lib/jni/
diff --cc debian/libreadline-java.jlibs
index 0000000,0000000..646faa9
new file mode 100644
--- /dev/null
+++ b/debian/libreadline-java.jlibs
@@@ -1,0 -1,0 +1,1 @@@
++libreadline-java.jar
diff --cc debian/patches/add-editline-native.patch
index 0000000,0000000..538882e
new file mode 100644
--- /dev/null
+++ b/debian/patches/add-editline-native.patch
@@@ -1,0 -1,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;
++ }
++
++ /* -------------------------------------------------------------------------- */
diff --cc debian/patches/add-editline.patch
index 0000000,0000000..454f2d3
new file mode 100644
--- /dev/null
+++ b/debian/patches/add-editline.patch
@@@ -1,0 -1,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});
++
++
++ /**
diff --cc debian/patches/correct-typo.patch
index 0000000,0000000..e7f5edd
new file mode 100644
--- /dev/null
+++ b/debian/patches/correct-typo.patch
@@@ -1,0 -1,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);
++ }
++
diff --cc debian/patches/makefile-fix.patch
index 0000000,0000000..cfdbcd8
new file mode 100644
--- /dev/null
+++ b/debian/patches/makefile-fix.patch
@@@ -1,0 -1,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
diff --cc debian/patches/native-makefile.patch
index 0000000,0000000..f11dacb
new file mode 100644
--- /dev/null
+++ b/debian/patches/native-makefile.patch
@@@ -1,0 -1,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_init at 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:
diff --cc debian/patches/series
index 0000000,0000000..b372b8f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,5 @@@
++add-editline.patch
++add-editline-native.patch
++correct-typo.patch
++native-makefile.patch
++makefile-fix.patch
diff --cc debian/rules
index 3e7381c,0000000..3d47c4c
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,108 -1,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
+
- jarname = libreadline-java
- jarversion = 0.8.0
- libnames = libJavaReadline.so libJavaEditline.so
- libmajor = 1
- libversion = 1.0.0
-
- tmp = debian/tmp
- javadir = $(tmp)/usr/share/java
- classdir = org/gnu/readline
+egdir = debian/libreadline-java-doc/usr/share/doc/libreadline-java-doc/examples
++export JAVA_HOME:=/usr/lib/jvm/default-java
+
- INSTALL_DIR = install -p -d -o root -g root -m 755
- INSTALL_FILE = install -p -o root -g root -m 644
-
- # Set java options according to which compiler is present.
-
- BUILDDIR=$(shell pwd)/build
-
- build: build-stamp
- build-stamp:
- dh_testdir
- $(MAKE) JAVAC=gcj JC_FLAGS=-C CC=gcc \
- JAVAINCLUDE=/usr/lib/jvm/default-java/include \
- JAVANATINC=/usr/lib/jvm/default-java/include \
- T_LIBS="JavaReadline JavaEditline"
- touch build-stamp
++%:
++ dh $@ --with javahelper
+
- clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- -$(MAKE) clean
- rm -f lib*.so*
- dh_clean
++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
+
- install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
++override_dh_auto_install:
++ # Skip auto-install - it causes a rebuild and we do not need it.
+
- # Install the shared libraries.
- $(INSTALL_DIR) $(tmp)/usr/lib/jni
- for i in $(libnames); do \
- $(INSTALL_FILE) $$i $(tmp)/usr/lib/jni; \
- done
++override_dh_auto_test:
++ # Skip tests - they dont work.
+
- # Install the jar.
- $(INSTALL_DIR) $(javadir)
- $(INSTALL_FILE) libreadline-java.jar $(javadir)/$(jarname)-$(jarversion).jar
-
- # Link the unversioned jar to the versioned jar.
- ln -s $(jarname)-$(jarversion).jar $(javadir)/$(jarname).jar
-
- # Build architecture-independent files here.
- binary-indep: build install
- dh_testdir
- dh_testroot
- dh_movefiles -i
- dh_installdocs -i
- dh_installexamples -i
++override_dh_installexamples:
++ dh_installexamples
+ # Tidy up the examples directory.
+ rm $(egdir)/test/Makefile
+ mv $(egdir)/libreadline-java-doc.README.test $(egdir)/README.test
- dh_installmenu -i
- dh_installchangelogs -plibreadline-java-doc ChangeLog
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- #dh_makeshlibs -i
- dh_installdeb -i
- #dh_perl -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
- # Build architecture-dependent files here.
- binary-arch: build install
- dh_testdir
- dh_testroot
- dh_movefiles -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installmenu -a
- dh_installchangelogs -plibreadline-java ChangeLog
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a
- dh_installdeb -a
- # dh_perl -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libreadline-java.git
More information about the pkg-java-commits
mailing list