debian: Upload to stable

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

ChangeLog.md

@@ -4,6 +4,18 @@ Change Log
 All notable changes to the project are documented in this file.
 
 
+[1.17.1][] - 2020-02-23
+-----------------------
+
+### Fixes
+- Fix #38: Fix for multiline representing as one line
+- Fix packaging, missing files in libeditline1, regression from 1.16.0
+- Fix packaging, update to latest std version
+- Fix formatting of function names in man page
+- Restore tar.gz distribution, for usability on systems that do not
+  have xz in their default install
+
+
 [1.17.0][] - 2020-01-05
 -----------------------
 
@@ -237,7 +249,8 @@ Adaptations to Debian editline package.
 - First version, forked from Minix current 2008-06-06
 
 
-[UNRELEASED]:    https://github.com/troglobit/finit/compare/1.17.0...HEAD
+[UNRELEASED]:    https://github.com/troglobit/finit/compare/1.17.1...HEAD
+[1.17.1]:        https://github.com/troglobit/finit/compare/1.17.0...1.17.1
 [1.17.0]:        https://github.com/troglobit/finit/compare/1.16.1...1.17.0
 [1.16.1]:        https://github.com/troglobit/finit/compare/1.16.0...1.16.1
 [1.16.0]:        https://github.com/troglobit/finit/compare/1.15.3...1.16.0

Makefile.am

@@ -4,10 +4,6 @@ doc_DATA        = README.md LICENSE
 EXTRA_DIST      = README.md LICENSE ChangeLog.md INSTALL.md
 SUBDIRS         = src include man examples
 
-## Generate .deb package
-package build-deb:
-	@dpkg-buildpackage -uc -us
-
 ## Generate MD5 checksum file
 MD5 = md5sum
 md5-dist:
@@ -39,7 +35,7 @@ package:
 	dpkg-buildpackage -uc -us -B
 
 ## Target to run when building a release
-release: distcheck release-hook md5-dist package
+release: release-hook distcheck md5-dist package
 	@echo
 	@echo "Resulting release files:"
 	@echo "========================================================================="

configure.ac

@@ -1,5 +1,6 @@
-AC_INIT(editline, 1.17.0, https://github.com/troglobit/editline/issues)
+AC_INIT(editline, 1.17.1, https://github.com/troglobit/editline/issues)
-AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
+AC_CONFIG_AUX_DIR(aux)
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz])
 AM_SILENT_RULES([yes])
 
 AC_CONFIG_MACRO_DIR([m4])

debian/changelog

@@ -1,3 +1,11 @@
+editline (1.17.1) stable; urgency=medium
+
+  * Fix multiline representing as one line
+  * Fix missing content in libedtline1, introduced in 1.16.0
+  * Update packaging to latest std version
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 23 Feb 2020 18:46:41 +0100
+
 editline (1.17.0) unstable; urgency=medium
 
   * Simple multi-line support

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -1,9 +1,9 @@
 Source: editline
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>= 5.0), libtool
+Build-Depends: debhelper (>= 10), libtool
 Maintainer: Joachim Nilsson <troglobit@gmail.com>
-Standards-Version: 3.8.3
+Standards-Version: 4.3.0
 
 Package: libeditline-dev
 Architecture: any
@@ -21,7 +21,7 @@ Description: development files for libeditline
 Package: libeditline1
 Architecture: any
 Section: libs
-Depends: ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc: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

debian/copyright

@@ -1,17 +1,23 @@
-This package was debianized by Jim Studt <jim@federated.com> on
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Fri,  5 May 2000 13:25:51 -0500.
+Upstream-Name: editline
+Upstream-Contact: Joachim Nilsson <troglobit@gmail.com>
+Source: http://github.com/troglobit/editline
+Comment: This package was originally debianized by Jim Studt <jim@federated.com>
+	 on Fri,  5 May 2000 13:25:51 -0500.  It was received from, then upstream
+	 author, Rich Salz <rsalz@shore.net>
 
-It was received from Rich Salz rsalz@shore.net
+Files: *
+Copyright: 1992,1993 Simmule Turner and Rich Salz.
+License: C-News
 
-Upstream Author: Rich Salz rsalz@shore.net
+Files: debian/*
-
+Copyright: 2010-2020 Joachim Nilsson <troglobit@gmail.com>
-Copyright:
+License: BSD-2-clause
-
- Copyright 1992,1993 Simmule Turner and Rich Salz.  All rights reserved.
 
+License: C-News
  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:
@@ -24,4 +30,3 @@ Copyright:
     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.
-

debian/libeditline-dev.install

@@ -1,4 +1,5 @@
 usr/include/*.h
 usr/lib/*/libeditline*.*a
+usr/lib/*/libeditline.so
 usr/lib/*/pkgconfig/*
 usr/share/man/man3/*

debian/libeditline0.install

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

debian/libeditline1.install

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

debian/libeditline1.symbols

@@ -0,0 +1,67 @@
+libeditline.so.1 libeditline1 #MINVER#
+* Build-Depends-Package: libeditline-dev
+ add_history@Base 1.17.1
+ el_bind_key@Base 1.17.1
+ el_bind_key_in_metamap@Base 1.17.1
+ el_del_char@Base 1.17.1
+ el_filename_complete@Base 1.17.1
+ el_filename_list_possib@Base 1.17.1
+ el_find_word@Base 1.17.1
+ el_hist_size@Base 1.17.1
+ el_next_hist@Base 1.17.1
+ el_no_echo@Base 1.17.1
+ el_no_hist@Base 1.17.1
+ el_prev_hist@Base 1.17.1
+ el_print_columns@Base 1.17.1
+ el_ring_bell@Base 1.17.1
+ prompt_len@Base 1.17.1
+ read_history@Base 1.17.1
+ readline@Base 1.17.1
+ rl_add_slash@Base 1.17.1
+ rl_attempted_completion_function@Base 1.17.1
+ rl_attempted_completion_over@Base 1.17.1
+ rl_callback_handler_install@Base 1.17.1
+ rl_callback_handler_remove@Base 1.17.1
+ rl_callback_read_char@Base 1.17.1
+ rl_clear_message@Base 1.17.1
+ rl_complete@Base 1.17.1
+ rl_completion_entry_function@Base 1.17.1
+ rl_completion_matches@Base 1.17.1
+ rl_deprep_term_function@Base 1.17.1
+ rl_deprep_terminal@Base 1.17.1
+ rl_end@Base 1.17.1
+ rl_eof@Base 1.17.1
+ rl_erase@Base 1.17.1
+ rl_event_hook@Base 1.17.1
+ rl_filename_completion_function@Base 1.17.1
+ rl_forced_update_display@Base 1.17.1
+ rl_getc@Base 1.17.1
+ rl_getc_function@Base 1.17.1
+ rl_inhibit_complete@Base 1.17.1
+ rl_initialize@Base 1.17.1
+ rl_insert_text@Base 1.17.1
+ rl_instream@Base 1.17.1
+ rl_intr@Base 1.17.1
+ rl_kill@Base 1.17.1
+ rl_line_buffer@Base 1.17.1
+ rl_list_possib@Base 1.17.1
+ rl_mark@Base 1.17.1
+ rl_meta_chars@Base 1.17.1
+ rl_outstream@Base 1.17.1
+ rl_point@Base 1.17.1
+ rl_prep_term_function@Base 1.17.1
+ rl_prep_terminal@Base 1.17.1
+ rl_prompt@Base 1.17.1
+ rl_quit@Base 1.17.1
+ rl_readline_name@Base 1.17.1
+ rl_refresh_line@Base 1.17.1
+ rl_reset_terminal@Base 1.17.1
+ rl_restore_prompt@Base 1.17.1
+ rl_save_prompt@Base 1.17.1
+ rl_set_complete_func@Base 1.17.1
+ rl_set_getc_func@Base 1.17.1
+ rl_set_list_possib_func@Base 1.17.1
+ rl_set_prompt@Base 1.17.1
+ rl_ttyset@Base 1.17.1
+ rl_uninitialize@Base 1.17.1
+ write_history@Base 1.17.1

debian/rules

@@ -1,8 +1,16 @@
 #!/usr/bin/make -f           
+# export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS  = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND  = -W -Wall -Wextra -O3
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-# Uncomment this to turn on verbose mode.
+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-#export DH_VERBOSE=1
+
+include /usr/share/dpkg/default.mk  # provides DEB_VERSION
 
 %:
 	dh $@ --with autoreconf
 
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog.md
+

man/editline.3

@@ -1,4 +1,4 @@
-.Dd April 27, 2019
+.Dd February 23, 2020
 .Dt EDITLINE 3
 .Os
 .Sh NAME
@@ -8,10 +8,22 @@
 .Lb libeditline
 .Sh SYNOPSIS
 .In editline.h
-.Fn "char *readline" "const char *prompt"
+.Ft char *
-.Fn "void add_history"  "const char *line"
+.Fo readline
-.Fn "int read_history"  "const char *filename"
+.Fa const char *prompt
-.Fn "int write_history" "const char *filename"
+.Fc
+.Ft void
+.Fo add_history
+.Fa const char *line
+.Fc
+.Ft int
+.Fo read_history
+.Fa const char *filename
+.Fc
+.Ft int
+.Fo write_history
+.Fa const char *filename
+.Fc
 .Sh DESCRIPTION
 .Nm
 is a library that provides n line-editing interface with history.  It

src/editline.c

@@ -216,8 +216,10 @@ static void tty_string(char *p)
 
     while (*p) {
         tty_show(*p++);
-        if ((i++) % tty_cols == 0)
+        if ((i++) % tty_cols == 0) {
-            tty_put('\n');
+            tty_put(' ');
+            tty_put('\b');
+        }
     }
 }