From 7330f21c283bd98c2a2fcc1427484042afe77388 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Mon, 8 Jul 2013 17:01:57 +0200 Subject: [PATCH] Bump version for release o Bump minor version for release o Update maintainer email address o Change to tar.xz for archive distribution Signed-off-by: Joachim Nilsson --- Makefile.in | 10 ++++------ README | 2 +- configure | 36 ++++++++++++++++++------------------ configure.ac | 6 +++--- debian/changelog | 9 +++++++++ 5 files changed, 35 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3688eba..73380fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -130,9 +130,8 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 \ - $(distdir).tar.lzma GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.xz distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -521,6 +520,7 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -528,10 +528,10 @@ dist-bzip2: distdir dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) + dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) @@ -550,9 +550,7 @@ dist-zip: distdir $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then diff --git a/README b/README index 0e63969..3746644 100644 --- a/README +++ b/README @@ -32,5 +32,5 @@ package and a different versioning scheme. In June 2009, I decided to line up alongside Debian, with the intent of merging the efforts. Enjoy, - Joachim Nilsson + Joachim Nilsson diff --git a/configure b/configure index 3b9ba29..43ae98f 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for editline 1.14.0. +# Generated by GNU Autoconf 2.69 for editline 1.14.1. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: troglobit@vmlinux.org about your system, including any +$0: troglobit@gmail.com about your system, including any $0: error possibly output before this message. Then install $0: a modern shell, or manually run the script under such a $0: shell if you do have one." @@ -590,9 +590,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='editline' PACKAGE_TARNAME='editline' -PACKAGE_VERSION='1.14.0' -PACKAGE_STRING='editline 1.14.0' -PACKAGE_BUGREPORT='troglobit@vmlinux.org' +PACKAGE_VERSION='1.14.1' +PACKAGE_STRING='editline 1.14.1' +PACKAGE_BUGREPORT='troglobit@gmail.com' PACKAGE_URL='' ac_unique_file="src/editline.c" @@ -1317,7 +1317,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 editline 1.14.0 to adapt to many kinds of systems. +\`configure' configures editline 1.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1387,7 +1387,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of editline 1.14.0:";; + short | recursive ) echo "Configuration of editline 1.14.1:";; esac cat <<\_ACEOF @@ -1436,7 +1436,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 . +Report bugs to . _ACEOF ac_status=$? fi @@ -1499,7 +1499,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -editline configure 1.14.0 +editline configure 1.14.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1844,9 +1844,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------ ## -## Report this to troglobit@vmlinux.org ## -## ------------------------------------ ##" +( $as_echo "## ---------------------------------- ## +## Report this to troglobit@gmail.com ## +## ---------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1922,7 +1922,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 editline $as_me 1.14.0, which was +It was created by editline $as_me 1.14.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2743,7 +2743,7 @@ fi # Define the identity of the package. PACKAGE='editline' - VERSION='1.14.0' + VERSION='1.14.1' cat >>confdefs.h <<_ACEOF @@ -12594,7 +12594,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by editline $as_me 1.14.0, which was +This file was extended by editline $as_me 1.14.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12654,13 +12654,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -editline config.status 1.14.0 +editline config.status 1.14.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index cce1b92..43a7676 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Minix libeditline -*- Autoconf -*- # -# Copyright (c) 2008-2010 Joachim Nilsson +# Copyright (c) 2008-2013 Joachim Nilsson # # Process this file with autoconf to produce a configure script. # @@ -13,13 +13,13 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. AC_PREREQ(2.61) -AC_INIT(editline, 1.14.0, troglobit@vmlinux.org) +AC_INIT(editline, 1.14.1, troglobit@gmail.com) AC_CONFIG_SRCDIR([src/editline.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) # Prepare automake -AM_INIT_AUTOMAKE([dist-bzip2 dist-lzma]) +AM_INIT_AUTOMAKE([no-dist-gzip dist-xz]) # Silent "kernel" style build from automake 1.11 and later. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/debian/changelog b/debian/changelog index 2238bb2..aaf08b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +editline (1.14.1-1) unstable; urgency=low + + * New release. + + Minor fixes to key binding. + + Check signals and custom keys before acting on them in readline(). + + Update maintainer email address. + + -- Joachim Nilsson Mon, 8 Jul 2013 17:04:00 +0100 + editline (1.14.0-1) unstable; urgency=low * Update to new configure based build.