ncurses 5.9 - patch 20141221

+ fix an incorrect variable assignment in 20141220 changes (report by
  Sven Joachim).

diff --git a/NEWS b/NEWS
index 6fcd432dcfedc755e6f8cfc968686286955af1b5..acb7e9101312041afd733b67761aec4a8164fe90 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- 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
 -------------------------------------------------------------------------------
 
 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.
 
 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
 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 b73dae439fb377fdf0e7462940518228ea769907..d09d130cdbcd20975759ce0da81599d86c087105 100644 (file)
--- 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 8bf3439875289bdff2b266878b4fa596a3c2f9eb..4379446deca591357775519b1b0130ae740c2620 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /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.
 #
 # 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])
        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=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
                ;;
        esac
 else

diff --git a/configure.in b/configure.in
index 73baccf1854ca14f97d73d471dd00c381b4834f8..b5e2530b2afb8728ae01c6656d8a210cb501bd38 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 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)
 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)
 
 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]])
        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=resulting.map
                ;;
        *)

-               RESULTING_SYMS="$UNALTERED_SYMS"
+               CF_VERBOSE(will map symbols to default ABI)

                ;;
        esac
 else
                ;;
        esac
 else

diff --git a/dist.mk b/dist.mk
index 934e1e46eda164cb50dc873d53a0a0e8ce934376..2183b477cb7d9a8d69f39306b1c7313023d50762 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # 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
 # 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
 # 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)
 
 # 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 406130fe67351875c7ceed81d3c60ba77ce8e7b2..1294db9e21d8f673a63711d69f5230298f640906 100644 (file)
--- 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
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Dec 2014 11:10:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 21 Dec 2014 12:23:21 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 406130fe67351875c7ceed81d3c60ba77ce8e7b2..1294db9e21d8f673a63711d69f5230298f640906 100644 (file)
--- 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
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Dec 2014 11:10:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 21 Dec 2014 12:23:21 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index eb6536c96301abff1531eab39ab53de0fac6e5c2..7f69d9ccc9d39915137368d0333a7cc986314f91 100644 (file)
--- 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
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Dec 2014 11:10:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 21 Dec 2014 12:23:21 -0500

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 4d43693eb7a8648cf68853485b2a732465de533b..bdb62a686c74410ca3a69e6764c48531dbee0261 100644 (file)
--- 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 $\r
+; $Id: mingw-ncurses.nsi,v 1.76 2014/12/21 17:23:21 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "5"\r
 !define VERSION_MINOR "9"\r
 !define VERSION_YYYY  "2014"\r
 !define VERSION_MAJOR "5"\r
 !define VERSION_MINOR "9"\r
 !define VERSION_YYYY  "2014"\r

-!define VERSION_MMDD  "1220"\r
+!define VERSION_MMDD  "1221"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 7491b97d0801e6a44072e10b10fa722903da6c34..8ef257b578b36b679f214e2f08a7b580e80cfaa6 100644 (file)
--- 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
 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
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index cbba6a6b1c6cc7146b284812e3fe9f040cde9bf0..2d92dd13964b98897445eb70dcf68ee6ef6fbb46 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 5.9
 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
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz