From: Thomas E. Dickey Date: Sun, 21 Dec 2014 18:22:29 +0000 (+0000) Subject: ncurses 5.9 - patch 20141221 X-Git-Tag: v6.0~30 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=596d5db3cda5749733f9803a4c2477c2ec9e3a33 ncurses 5.9 - patch 20141221 + fix an incorrect variable assignment in 20141220 changes (report by Sven Joachim). --- diff --git a/NEWS b/NEWS index 6fcd432d..acb7e910 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2318 2014/12/21 00:20:46 tom Exp $ +-- $Id: NEWS,v 1.2320 2014/12/21 17:32:58 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,10 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20141221 + + fix an incorrect variable assignment in 20141220 changes (report by + Sven Joachim). + 20141220 + updated Ada95/configure with macro changes from 20141213 + tie configure options --with-abi-version and --with-versioned-syms diff --git a/VERSION b/VERSION index b73dae43..d09d130c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 5.9 20141220 +5:0:9 5.9 20141221 diff --git a/configure b/configure index 8bf34398..4379446d 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.594 . +# From configure.in Revision: 1.595 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20141204. # @@ -21980,17 +21980,17 @@ then UNALTERED_SYMS=`echo "$RESULTING_SYMS" | sed -e 's/\\$/\\\\$/g'` case $cf_cv_abi_version in [6789]) - if test -n "$VERSIONED_SYMS" - then - test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 + test -n "$verbose" && echo " will map symbols to ABI=$cf_cv_abi_version" 1>&6 -echo "${as_me:-configure}:21987: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 +echo "${as_me:-configure}:21985: testing will map symbols to ABI=$cf_cv_abi_version ..." 1>&5 - fi RESULTING_SYMS=resulting.map ;; *) - RESULTING_SYMS="$UNALTERED_SYMS" + test -n "$verbose" && echo " will map symbols to default ABI" 1>&6 + +echo "${as_me:-configure}:21992: testing will map symbols to default ABI ..." 1>&5 + ;; esac else diff --git a/configure.in b/configure.in index 73baccf1..b5e2530b 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.594 2014/12/21 00:00:25 tom Exp $ +dnl $Id: configure.in,v 1.595 2014/12/21 17:25:38 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.594 $) +AC_REVISION($Revision: 1.595 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -2098,14 +2098,11 @@ then UNALTERED_SYMS=`echo "$RESULTING_SYMS" | sed -e 's/\\$/\\\\$/g'` case $cf_cv_abi_version in [[6789]]) - if test -n "$VERSIONED_SYMS" - then - CF_VERBOSE(will map symbols to ABI=$cf_cv_abi_version) - fi + CF_VERBOSE(will map symbols to ABI=$cf_cv_abi_version) RESULTING_SYMS=resulting.map ;; *) - RESULTING_SYMS="$UNALTERED_SYMS" + CF_VERBOSE(will map symbols to default ABI) ;; esac else diff --git a/dist.mk b/dist.mk index 934e1e46..2183b477 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1020 2014/12/20 16:10:23 tom Exp $ +# $Id: dist.mk,v 1.1021 2014/12/21 17:23:21 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20141220 +NCURSES_PATCH = 20141221 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 406130fe..1294db9e 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20141220) unstable; urgency=low +ncurses6 (5.9+20141221) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 20 Dec 2014 11:10:23 -0500 + -- Thomas E. Dickey Sun, 21 Dec 2014 12:23:21 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 406130fe..1294db9e 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20141220) unstable; urgency=low +ncurses6 (5.9+20141221) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 20 Dec 2014 11:10:23 -0500 + -- Thomas E. Dickey Sun, 21 Dec 2014 12:23:21 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index eb6536c9..7f69d9cc 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20141220) unstable; urgency=low +ncurses6 (5.9+20141221) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 20 Dec 2014 11:10:23 -0500 + -- Thomas E. Dickey Sun, 21 Dec 2014 12:23:21 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 4d43693e..bdb62a68 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.75 2014/12/20 16:10:23 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.76 2014/12/21 17:23:21 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "5" !define VERSION_MINOR "9" !define VERSION_YYYY "2014" -!define VERSION_MMDD "1220" +!define VERSION_MMDD "1221" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 7491b97d..8ef257b5 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 5.9 -Release: 20141220 +Release: 20141221 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index cbba6a6b..2d92dd13 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 5.9 -Release: 20141220 +Release: 20141221 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz