Hi I have adopted libreadline-java which builds these binary packages: libreadline-java - GNU readline and BSD editline wrappers for Java libreadline-java-doc - API docs for readline/editline wrappers for Java I have repacked the source, since I noticed that it contained files not owned by the upstream author and without license in them. There is no watch file, nor a repack script. The last upstream release was from 2003 and last commit on upstreams CVS seems to be from same year. I started my work on it before I put it on the SVN, so hardly any of the changes are available via SVN's log. To amend this I have generated a packaging diff[1]. A fair share of the changes involves turning changes to upstream code from diff.gz into patches. The package can be found at: - URL: http://mentors.debian.net/debian/pool/main/l/libreadline-java - Source repository: deb-src http://mentors.debian.net/debian unstable main contrib non-free - dget http://mentors.debian.net/debian/pool/main/l/libreadline-java/libreadline-java_0.8.0.1+dfsg-1.dsc - svn co svn://svn.debian.org/svn/pkg-java/trunk/libreadline-java While I am a DM I have not set the DMUA flag (see [2]) ~Niels [1] I used pdebdiff: http://www.student.dtu.dk/~s072425/debian/pdebdiff NB: I manually removed the html files/javadoc that had ended up in the diff.gz (presumably due to a bug in the clean target of that version) to reduce the amount of "uninteresting" changes. [2] http://lists.debian.org/debian-mentors/2010/03/msg00234.html
reverted:
--- libreadline-java-0.8.0.1/Makefile
+++ libreadline-java-0.8.0.1.orig/Makefile
@@ -86,10 +86,10 @@
world : jar build-native
jar: build-java
+ cd $(BUILDDIR) ; jar -cvmf ../$(MF_STUB) ../$(JAR) *
- cd $(BUILDDIR) ; fastjar -cvf ../$(JAR) org
$(JAR):
+ cd $(BUILDDIR) ; jar -cvmf ../$(MF_STUB) ../$(JAR) *
- cd $(BUILDDIR) ; fastjar -cvf ../$(JAR) org
build-java: $(BUILDDIR)
cd src ; $(MAKE) JAVAC="$(JAVAC)" JC_FLAGS="$(JC_FLAGS)" java
reverted:
--- libreadline-java-0.8.0.1/src/test/ReadlineTest.java
+++ libreadline-java-0.8.0.1.orig/src/test/ReadlineTest.java
@@ -114,7 +114,7 @@
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);
}
reverted:
--- libreadline-java-0.8.0.1/src/native/Makefile
+++ libreadline-java-0.8.0.1.orig/src/native/Makefile
@@ -44,7 +44,7 @@
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
@@ -110,7 +110,7 @@
-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
- gjavah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline
touch org_gnu_readline_Readline.h
clean:
reverted:
--- libreadline-java-0.8.0.1/src/native/org_gnu_readline_Readline.c
+++ libreadline-java-0.8.0.1.orig/src/native/org_gnu_readline_Readline.c
@@ -70,14 +70,6 @@
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,
@@ -153,8 +145,8 @@
&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, */
@@ -169,34 +161,34 @@
&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, */
@@ -822,17 +814,14 @@
/* 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 */
@@ -858,12 +847,9 @@
/* 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;
}
/* -------------------------------------------------------------------------- */
reverted:
--- libreadline-java-0.8.0.1/src/org/gnu/readline/Readline.java
+++ libreadline-java-0.8.0.1.orig/src/org/gnu/readline/Readline.java
@@ -79,14 +79,13 @@
<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});
/**
@@ -96,14 +95,13 @@
<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});
/**
@@ -129,14 +127,13 @@
<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});
/**
@@ -178,14 +175,13 @@
<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});
/**
@@ -195,14 +191,13 @@
<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});
/**
@@ -212,14 +207,13 @@
<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});
/**
@@ -261,14 +255,13 @@
<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});
/**
@@ -405,14 +398,13 @@
<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});
/**
@@ -422,14 +414,13 @@
<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});
/**
@@ -663,14 +654,13 @@
<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});
/**
@@ -680,14 +670,13 @@
<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});
/**
@@ -713,14 +702,13 @@
<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});
/**
@@ -762,14 +750,13 @@
<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});
/**
@@ -779,14 +766,13 @@
<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});
/**
@@ -796,14 +782,13 @@
<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});
/**
reverted:
--- libreadline-java-0.8.0.1/debian/libreadline-java-doc.README.Debian
+++ libreadline-java-0.8.0.1.orig/debian/libreadline-java-doc.README.Debian
@@ -1,15 +0,0 @@
-libreadline-java documentation for Debian
------------------------------------------
-
-The GNU readline and BSD editline wrappers are provided by debian package
-libreadline-java. Package libreadline-java-doc contains the API
-documentation for these wrapper classes and some examples of their usage.
-
-The API documentation can be found in the directory
-/usr/share/doc/libreadline-java-doc/api-html/.
-
-The test classes, although described in the API documentation, are not
-provided by libreadline-java. They can instead be found in the directory
-/usr/share/doc/libreadline-java-doc/examples/.
-
- -- Ben Burton <bab@debian.org>, Thu, 3 Oct 2002 16:36:21 +1000
diff -u libreadline-java-0.8.0.1/debian/libreadline-java-doc.doc-base libreadline-java-0.8.0.1/debian/libreadline-java-doc.doc-base
--- libreadline-java-0.8.0.1/debian/libreadline-java-doc.doc-base
+++ libreadline-java-0.8.0.1/debian/libreadline-java-doc.doc-base 2010-04-21 22:47:50.431497111 +0200
@@ -6,5 +6,5 @@
-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 -u libreadline-java-0.8.0.1/debian/libreadline-java-doc.docs libreadline-java-0.8.0.1/debian/libreadline-java-doc.docs
--- libreadline-java-0.8.0.1/debian/libreadline-java-doc.docs
+++ libreadline-java-0.8.0.1/debian/libreadline-java-doc.docs 2010-04-20 00:42:19.703495676 +0200
@@ -1,4 +1,4 @@
-api-html
+api
README
README.1st
NEWS
diff -u libreadline-java-0.8.0.1/debian/libreadline-java-doc.README.test libreadline-java-0.8.0.1/debian/libreadline-java-doc.README.test
--- libreadline-java-0.8.0.1/debian/libreadline-java-doc.README.test
+++ libreadline-java-0.8.0.1/debian/libreadline-java-doc.README.test 2010-04-20 00:02:28.631497151 +0200
@@ -6,7 +6,7 @@
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
diff -u libreadline-java-0.8.0.1/debian/copyright libreadline-java-0.8.0.1/debian/copyright
--- libreadline-java-0.8.0.1/debian/copyright
+++ libreadline-java-0.8.0.1/debian/copyright 2010-04-21 22:52:21.999508847 +0200
@@ -1,23 +1,43 @@
-This package was debianized by Ben Burton <bab@debian.org> on
-Sat, 30 Jun 2001 18:03:06 -0500.
-
-It was downloaded from http://java-readline.sourceforge.net/.
-
-Upstream Author: Bernhard Bablok <mail@bablokb.de>
-
-Copyright:
-
-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.
+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 <mail@bablokb.de>
+License: LGPL-2.0+
+
+Files: src/native/getline.[ch]
+Copyright: 1991-1994, Chris Thewalt <thewalt@ce.berkeley.edu>
+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'.
diff -u libreadline-java-0.8.0.1/debian/rules libreadline-java-0.8.0.1/debian/rules
--- libreadline-java-0.8.0.1/debian/rules
+++ libreadline-java-0.8.0.1/debian/rules 2010-04-21 23:21:47.392496703 +0200
@@ -8,101 +8,24 @@
-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
+%:
+ dh $@ --with javahelper
-# Set java options according to which compiler is present.
+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
-BUILDDIR=$(shell pwd)/build
+override_dh_auto_install:
+ # Skip auto-install - it causes a rebuild and we do not need it.
-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
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- -$(MAKE) clean
- rm -f lib*.so*
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Install the shared libraries.
- $(INSTALL_DIR) $(tmp)/usr/lib/jni
- for i in $(libnames); do \
- $(INSTALL_FILE) $$i $(tmp)/usr/lib/jni; \
- done
-
- # 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_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
- 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 -u libreadline-java-0.8.0.1/debian/compat libreadline-java-0.8.0.1/debian/compat
--- libreadline-java-0.8.0.1/debian/compat
+++ libreadline-java-0.8.0.1/debian/compat 2010-04-20 00:27:54.855508898 +0200
@@ -1 +1 @@
-5
+7
diff -u libreadline-java-0.8.0.1/debian/changelog libreadline-java-0.8.0.1/debian/changelog
--- libreadline-java-0.8.0.1/debian/changelog
+++ libreadline-java-0.8.0.1/debian/changelog 2010-04-21 23:24:16.135497244 +0200
@@ -1,3 +1,28 @@
+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@thykier.net> Wed, 21 Apr 2010 23:50:08 +0200
+
libreadline-java (0.8.0.1-8.2) unstable; urgency=low
* Non-maintainer upload
diff -u libreadline-java-0.8.0.1/debian/libreadline-java.README.Debian libreadline-java-0.8.0.1/debian/libreadline-java.README.Debian
--- libreadline-java-0.8.0.1/debian/libreadline-java.README.Debian
+++ libreadline-java-0.8.0.1/debian/libreadline-java.README.Debian 2010-04-21 22:08:31.244496050 +0200
@@ -4,11 +4,6 @@
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
diff -u libreadline-java-0.8.0.1/debian/control libreadline-java-0.8.0.1/debian/control
--- libreadline-java-0.8.0.1/debian/control
+++ libreadline-java-0.8.0.1/debian/control 2010-04-21 23:16:26.571507022 +0200
@@ -1,14 +1,17 @@
Source: libreadline-java
-Section: libs
+Section: java
Priority: optional
-Maintainer: Ben Burton <bab@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@lists.alioth.debian.org>
+Uploaders: Niels Thykier <niels@thykier.net>
+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)
@@ -22,13 +25,13 @@
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)
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/clean 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/clean 2010-04-21 23:09:08.135495943 +0200
@@ -0,0 +1 @@
+lib*.so*
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/libreadline-java.install 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/libreadline-java.install 2010-04-21 23:10:35.975814110 +0200
@@ -0,0 +1,2 @@
+libJavaReadline.so usr/lib/jni/
+libJavaEditline.so usr/lib/jni/
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/libreadline-java.jlibs 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/libreadline-java.jlibs 2010-04-21 23:11:47.432762502 +0200
@@ -0,0 +1 @@
+libreadline-java.jar
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/patches/add-editline-native.patch 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/patches/add-editline-native.patch 2010-04-21 22:32:32.207495868 +0200
@@ -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;
+ }
+
+ /* -------------------------------------------------------------------------- */
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/patches/add-editline.patch 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/patches/add-editline.patch 2010-04-21 22:13:21.811499088 +0200
@@ -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});
+
+
+ /**
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/patches/correct-typo.patch 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/patches/correct-typo.patch 2010-04-21 22:16:59.840522100 +0200
@@ -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);
+ }
+
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/patches/makefile-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/patches/makefile-fix.patch 2010-04-21 22:34:33.403498598 +0200
@@ -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
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/patches/native-makefile.patch 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/patches/native-makefile.patch 2010-04-21 22:17:56.273383514 +0200
@@ -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_init@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:
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/patches/series 2010-04-21 22:36:07.451499602 +0200
@@ -0,0 +1,5 @@
+add-editline.patch
+add-editline-native.patch
+correct-typo.patch
+native-makefile.patch
+makefile-fix.patch
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/README.source 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/README.source 2010-04-21 23:24:02.227495687 +0200
@@ -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 <niels@thykier.net> Wed, 21 Apr 2010 23:23:00 +0200
only in patch2:
unchanged:
--- libreadline-java-0.8.0.1.orig/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ libreadline-java-0.8.0.1/debian/source/format 2010-04-20 00:00:20.187512178 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
Attachment:
signature.asc
Description: OpenPGP digital signature