Change name from Minix editline to just editline. This also affects

the library name, from libedit.a to libeditline.a 

Bump version to 1.13.0 to better illustrate it has the same heritage
as the Debian version.

Import the debian/ directory from editline-1.12-5.

Yes, this is a major changeset. :)
This commit is contained in:
Joachim Nilsson 2009-06-14 20:17:10 +02:00
parent 48465835b8
commit fc498f305b
18 changed files with 370 additions and 158 deletions

5
NEWS
View File

@ -1,5 +1,10 @@
Notable Changes
* v1.13.0 - Adaptations to Debian editline package
** Major version number bump, adapt to Jum Studt's v1.12
** Import debian/ directory and adapt it to configure et al.
** Change library name to libeditline to distinguish it from BSD libedit.
* v0.3.0
** Support for ANSI arrow keys using --enable-arrow-keys

49
README
View File

@ -1,23 +1,40 @@
README -*-text-*-
This is a line-editing library. It can be linked into almost any
program to provide command-line editing and history.
This is a line-editing library. It can be linked into almost any program to
provide command-line editing and history.
It is call-compatible with the FSF readline library, but it is a
fraction of the size (and offers fewer features). It does not use
standard I/O. It is distributed under a "C News-like" copyright, see
the file LICENSE for details.
It is call-compatible with the FSF readline library, but it is a fraction of
the size (and offers fewer features). It does not use standard I/O. It is
distributed under a "C News-like" copyright, see the file LICENSE for
details.
Configuration is made by supplying different options to the GNU
configure script. In the examples directory you can find a small and
slow shell for testing called testit.
Configuration is made by supplying different options to the GNU configure
script. In the examples/ directory you can find a couple of small & slow
shell implementations used for testing.
This library was previously also packaged exclusively for Debian. The
exact origin of the Debian version is unclear, see the Sid package at
http://packages.debian.org/sid/libeditline0 for details. There are
some differences between that version and upstream, some of those
patches will also be merged here.
Before finding out about the Debian version I was on the lookout for a
really small replacement for the GNU readline package. Not only was it large
and GPL:ed (instead of LGPL:ed), it also depended on libncurses, so the
resulting size was a bit too much for my embedded system. I eventually
stubmled upon the BSD libedit library, which was sufficient for a while,
even though it too depended upon libncurses. I searched my soul and went
back to where I, back in 1996, started out -- Minix. And there it was, a
really small readline replacement!
In 2000 Jim Studt packaged libeditline for Debian[1], the exact origin of
the Debian code base is unclear, see the Sid package[2] for details. There
were some notable differences between that version and the upstream Minix
sources, all of which have now been merged here.
An explanation of the version numbering may be in order. I didn't know
about the Debian version for quite some time, so I kept a different name for
the package and a different versioning scheme. Now, in June 2009, I decided
to line up alongside Debian, with the intent of merging the efforts. Sorry
for any confusion this might cause.
Enjoy,
Joachim Nilsson
<joachim@vmlinux.org>
Joachim Nilsson <joachim.nilsson@vmlinux.org>
[1] - http://lists.debian.org/debian-devel/2000/05/msg00548.html
[2] - http://packages.debian.org/sid/libeditline0

6
aclocal.m4 vendored
View File

@ -310,12 +310,13 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
#serial 4
#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[# Autoconf 2.62 quotes --file arguments for eval, but not when files
[{
# Autoconf 2.62 quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@ -363,6 +364,7 @@ do
echo '# dummy' > "$dirpart/$file"
done
done
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS

44
configure vendored
View File

@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for Minix editline 0.3.0.
# Generated by GNU Autoconf 2.63 for editline 1.13.0.
#
# Report bugs to <joachim@vmlinux.org>.
# Report bugs to <joachim.nilsson@vmlinux.org>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@ -594,11 +594,11 @@ MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Minix editline'
PACKAGE_TARNAME='minix-editline'
PACKAGE_VERSION='0.3.0'
PACKAGE_STRING='Minix editline 0.3.0'
PACKAGE_BUGREPORT='joachim@vmlinux.org'
PACKAGE_NAME='editline'
PACKAGE_TARNAME='editline'
PACKAGE_VERSION='1.13.0'
PACKAGE_STRING='editline 1.13.0'
PACKAGE_BUGREPORT='joachim.nilsson@vmlinux.org'
ac_unique_file="src/editline.c"
# Factoring default headers for most tests.
@ -1289,7 +1289,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Minix editline 0.3.0 to adapt to many kinds of systems.
\`configure' configures editline 1.13.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1337,7 +1337,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/minix-editline]
--docdir=DIR documentation root [DATAROOTDIR/doc/editline]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@ -1355,7 +1355,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Minix editline 0.3.0:";;
short | recursive ) echo "Configuration of editline 1.13.0:";;
esac
cat <<\_ACEOF
@ -1381,7 +1381,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <joachim@vmlinux.org>.
Report bugs to <joachim.nilsson@vmlinux.org>.
_ACEOF
ac_status=$?
fi
@ -1444,7 +1444,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Minix editline configure 0.3.0
editline configure 1.13.0
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1458,7 +1458,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Minix editline $as_me 0.3.0, which was
It was created by editline $as_me 1.13.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@ -2178,8 +2178,8 @@ fi
# Define the identity of the package.
PACKAGE='minix-editline'
VERSION='0.3.0'
PACKAGE='editline'
VERSION='1.13.0'
cat >>confdefs.h <<_ACEOF
@ -4526,9 +4526,9 @@ $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ---------------------------------- ##
## Report this to joachim@vmlinux.org ##
## ---------------------------------- ##
## ------------------------------------------ ##
## Report this to joachim.nilsson@vmlinux.org ##
## ------------------------------------------ ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
@ -5639,7 +5639,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Minix editline $as_me 0.3.0, which was
This file was extended by editline $as_me 1.13.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -5702,7 +5702,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
Minix editline config.status 0.3.0
editline config.status 1.13.0
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -6486,7 +6486,8 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
# Autoconf 2.62 quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@ -6618,6 +6619,7 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
echo '# dummy' > "$dirpart/$file"
done
done
}
;;
esac

View File

@ -1,8 +1,8 @@
# -*- Autoconf -*-
# Minix libeditline -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT(Minix editline, 0.3.0, joachim@vmlinux.org)
AC_INIT(editline, 1.13.0, joachim.nilsson@vmlinux.org)
AC_CONFIG_SRCDIR([src/editline.c])
AC_CONFIG_HEADER([config.h])

9
debian/README.Debian vendored Normal file
View File

@ -0,0 +1,9 @@
editline for Debian
----------------------
This is packaged in typical Debian form with a shared library version and
a static library version. It will be a rare package that wishes to
use the shared library form, the static one is only adds about 12.5kb
to your program.
-- Jim Studt <jim@federated.com>, Fri, 5 May 2000 13:25:51 -0500

49
debian/changelog vendored Normal file
View File

@ -0,0 +1,49 @@
editline (1.12-5) unstable; urgency=low
* New maintainer (Closes: #229962).
* debian/changelog:
+ Removed emacs helper variables.
* debian/control:
+ Set policy to 3.6.1.0.
+ Set debhelper build dependency to (>= 4.0).
+ Use the default dh_shlibs information, since the API is rock stable
(Closes: #131139).
+ Removed the libc6-dev dependency in the -dev package.
+ Rephrased the short and long descriptions.
* debian/copyright:
+ Replaced "Author(s)" with "Author".
* debian/rules:
+ Removed obsolete call to dh_suidregister.
+ Use debian/compat instead of DH_COMPAT.
* include_editline.h:
+ Added a minimalist /usr/include/editline.h (Closes: #129544).
* Makefile:
+ Call libtool with the proper --mode flags.
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sat, 31 Jan 2004 22:32:35 +0100
editline (1.12-4) unstable; urgency=low
* Add a Build-Depends for debhelper and libtool. Thought those
were baseline. closes: #117780
-- Jim Studt <jim@federated.com> Thu, 15 Nov 2001 19:00:00 -0600
editline (1.12-3) unstable; urgency=low
* Make man pages not be in the shared library package.
-- Jim Studt <jim@federated.com> Sat, 13 Jan 2001 00:03:53 -0600
editline (1.12-2) unstable; urgency=low
* Patch to not declare read() and write(), it fails on alphas.
-- Jim Studt <jim@federated.com> Tue, 12 Sep 2000 16:39:34 -0500
editline (1.12-1) unstable; urgency=low
* Initial Release.
-- Jim Studt <jim@federated.com> Fri, 5 May 2000 13:25:51 -0500

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
4

31
debian/control vendored Normal file
View File

@ -0,0 +1,31 @@
Source: editline
Section: devel
Priority: optional
Build-Depends: debhelper (>= 4.0), libtool
Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
Standards-Version: 3.6.1.0
Package: libeditline-dev
Architecture: any
Section: libdevel
Depends: libeditline0 (= ${Source-Version})
Description: development files for libeditline
This is a line-editing library. It can be linked into almost any program
to provide command-line editing and recall. It is call-compatible with a
subset of the FSF readline library, but it is a fraction of the size (and
offers fewer features).
.
This package contains the developer files: static libraries, headers,
manpages.
Package: libeditline0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Description: line editing library similar to readline
This is a line-editing library. It can be linked into almost any program
to provide command-line editing and recall. It is call-compatible with a
subset of the FSF readline library, but it is a fraction of the size (and
offers fewer features).
.
This package contains the runtime library only.

27
debian/copyright vendored Normal file
View File

@ -0,0 +1,27 @@
This package was debianized by Jim Studt <jim@federated.com> on
Fri, 5 May 2000 13:25:51 -0500.
It was received from Rich Salz rsalz@shore.net
Upstream Author: Rich Salz rsalz@shore.net
Copyright:
Copyright 1992,1993 Simmule Turner and Rich Salz. All rights reserved.
This software is not subject to any license of the American Telephone
and Telegraph Company or of the Regents of the University of California.
Permission is granted to anyone to use this software for any purpose on
any computer system, and to alter it and redistribute it freely, subject
to the following restrictions:
1. The authors are not responsible for the consequences of use of this
software, no matter how awful, even if they arise from flaws in it.
2. The origin of this software must not be misrepresented, either by
explicit claim or by omission. Since few users ever read sources,
credits must appear in the documentation.
3. Altered versions must be plainly marked as such, and must not be
misrepresented as being the original software. Since few users
ever read sources, credits must appear in the documentation.
4. This notice may not be removed or altered.

2
debian/dirs vendored Normal file
View File

@ -0,0 +1,2 @@
usr/lib
usr/include

1
debian/docs vendored Normal file
View File

@ -0,0 +1 @@
README

1
debian/editline1.files vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/*.so.*

67
debian/rules vendored Executable file
View File

@ -0,0 +1,67 @@
#!/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
# shared library versions, option 1
version=0.0.0
major=0
build: build-stamp
build-stamp:
dh_testdir
$(MAKE)
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
-$(MAKE) clean
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=`pwd`/debian/libeditline-dev
cp include_editline.h \
`pwd`/debian/libeditline-dev/usr/include/editline.h
binary-indep: build install
binary-arch: build install
# dh_testversion
dh_testdir
dh_testroot
# build libeditline${major} package by moving files from editline-dev
dh_movefiles --sourcedir=debian/libeditline-dev \
-plibeditline$(major) \
usr/lib/libeditline.so.$(major) \
usr/lib/libeditline.so.$(version)
dh_installdocs
dh_installexamples
dh_installmenu
dh_installmanpages
rm -r debian/libeditline0/usr/share/man/
dh_installcron
dh_installinfo
dh_installchangelogs
dh_link
dh_strip
dh_compress
dh_fixperms
dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install

View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
LDADD = $(top_builddir)/src/libedit.a
LDADD = $(top_builddir)/src/libeditline.a
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
# TODO: Port "fileman" example from BSD editline

View File

@ -44,11 +44,11 @@ PROGRAMS = $(noinst_PROGRAMS)
cli_SOURCES = cli.c
cli_OBJECTS = cli.$(OBJEXT)
cli_LDADD = $(LDADD)
cli_DEPENDENCIES = $(top_builddir)/src/libedit.a
cli_DEPENDENCIES = $(top_builddir)/src/libeditline.a
testit_SOURCES = testit.c
testit_OBJECTS = testit.$(OBJEXT)
testit_LDADD = $(LDADD)
testit_DEPENDENCIES = $(top_builddir)/src/libedit.a
testit_DEPENDENCIES = $(top_builddir)/src/libeditline.a
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -148,7 +148,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
LDADD = $(top_builddir)/src/libedit.a
LDADD = $(top_builddir)/src/libeditline.a
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
all: all-am

View File

@ -1,10 +1,8 @@
AUTOMAKE_OPTIONS = foreign
lib_LIBRARIES = libedit.a
libedit_a_SOURCES = editline.c editline.h sysunix.c unix.h
lib_LIBRARIES = libeditline.a
libeditline_a_SOURCES = editline.c editline.h sysunix.c unix.h
if COMPLETE
# Built-in completion handler.
libedit_a_SOURCES += complete.c
libeditline_a_SOURCES += complete.c
AM_CPPFLAGS = -DCOMPLETE
endif

View File

@ -52,14 +52,14 @@ libLIBRARIES_INSTALL = $(INSTALL_DATA)
LIBRARIES = $(lib_LIBRARIES)
AR = ar
ARFLAGS = cru
libedit_a_AR = $(AR) $(ARFLAGS)
libedit_a_LIBADD =
am__libedit_a_SOURCES_DIST = editline.c editline.h sysunix.c unix.h \
complete.c
libeditline_a_AR = $(AR) $(ARFLAGS)
libeditline_a_LIBADD =
am__libeditline_a_SOURCES_DIST = editline.c editline.h sysunix.c \
unix.h complete.c
@COMPLETE_TRUE@am__objects_1 = complete.$(OBJEXT)
am_libedit_a_OBJECTS = editline.$(OBJEXT) sysunix.$(OBJEXT) \
am_libeditline_a_OBJECTS = editline.$(OBJEXT) sysunix.$(OBJEXT) \
$(am__objects_1)
libedit_a_OBJECTS = $(am_libedit_a_OBJECTS)
libeditline_a_OBJECTS = $(am_libeditline_a_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -67,8 +67,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libedit_a_SOURCES)
DIST_SOURCES = $(am__libedit_a_SOURCES_DIST)
SOURCES = $(libeditline_a_SOURCES)
DIST_SOURCES = $(am__libeditline_a_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -159,8 +159,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
lib_LIBRARIES = libedit.a
libedit_a_SOURCES = editline.c editline.h sysunix.c unix.h \
lib_LIBRARIES = libeditline.a
libeditline_a_SOURCES = editline.c editline.h sysunix.c unix.h \
$(am__append_1)
@COMPLETE_TRUE@AM_CPPFLAGS = -DCOMPLETE
all: all-am
@ -225,10 +225,10 @@ uninstall-libLIBRARIES:
clean-libLIBRARIES:
-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
libedit.a: $(libedit_a_OBJECTS) $(libedit_a_DEPENDENCIES)
-rm -f libedit.a
$(libedit_a_AR) libedit.a $(libedit_a_OBJECTS) $(libedit_a_LIBADD)
$(RANLIB) libedit.a
libeditline.a: $(libeditline_a_OBJECTS) $(libeditline_a_DEPENDENCIES)
-rm -f libeditline.a
$(libeditline_a_AR) libeditline.a $(libeditline_a_OBJECTS) $(libeditline_a_LIBADD)
$(RANLIB) libeditline.a
mostlyclean-compile:
-rm -f *.$(OBJEXT)