From: Thomas E. Dickey Date: Mon, 14 Oct 2013 22:13:49 +0000 (+0000) Subject: ncurses 5.9 - patch 20131014 X-Git-Tag: v6.0~85 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=ff4cca6e1dfc932e229643403cdd59a6dd4b1abb ncurses 5.9 - patch 20131014 + fix new typo in CF_ADA_INCLUDE_DIRS macro (report by Roumen Petrov). --- diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 2dfa5d0c..4391e02f 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.73 2013/10/12 21:01:04 tom Exp $ +dnl $Id: aclocal.m4,v 1.74 2013/10/14 08:48:41 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -65,7 +65,7 @@ define([CF_ACVERSION_COMPARE], [ifelse([$8], , ,[$8])], [ifelse([$9], , ,[$9])])])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADA_INCLUDE_DIRS version: 7 updated: 2013/10/12 16:45:09 +dnl CF_ADA_INCLUDE_DIRS version: 8 updated: 2013/10/14 04:24:07 dnl ------------------- dnl Construct the list of include-options for the C programs in the Ada95 dnl binding. @@ -79,7 +79,7 @@ if test "$GCC" != yes; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" elif test "$includedir" != "/usr/include"; then if test "$includedir" = '${prefix}/include' ; then - if test x$prefix != /usr ; then + if test x$prefix != x/usr ; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" fi else diff --git a/Ada95/configure b/Ada95/configure index f81cf90c..18328945 100644 --- a/Ada95/configure +++ b/Ada95/configure @@ -11858,7 +11858,7 @@ if test "$GCC" != yes; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" elif test "$includedir" != "/usr/include"; then if test "$includedir" = '${prefix}/include' ; then - if test x$prefix != /usr ; then + if test x$prefix != x/usr ; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" fi else diff --git a/NEWS b/NEWS index 09c7447c..b1d35785 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.2117 2013/10/12 23:15:23 tom Exp $ +-- $Id: NEWS,v 1.2119 2013/10/14 08:33:15 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,9 @@ 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. +20131014 + + fix new typo in CF_ADA_INCLUDE_DIRS macro (report by Roumen Petrov). + 20131012 + fix a few compiler warnings in progs and test. + minor fix to package/debian-mingw/rules, do not strip dll's. diff --git a/aclocal.m4 b/aclocal.m4 index 04cf49b6..c94aea4e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.680 2013/10/12 20:45:47 tom Exp $ +dnl $Id: aclocal.m4,v 1.681 2013/10/14 08:26:40 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -88,7 +88,7 @@ define([CF_ACVERSION_COMPARE], [ifelse([$8], , ,[$8])], [ifelse([$9], , ,[$9])])])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADA_INCLUDE_DIRS version: 7 updated: 2013/10/12 16:45:09 +dnl CF_ADA_INCLUDE_DIRS version: 8 updated: 2013/10/14 04:24:07 dnl ------------------- dnl Construct the list of include-options for the C programs in the Ada95 dnl binding. @@ -102,7 +102,7 @@ if test "$GCC" != yes; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" elif test "$includedir" != "/usr/include"; then if test "$includedir" = '${prefix}/include' ; then - if test x$prefix != /usr ; then + if test x$prefix != x/usr ; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" fi else diff --git a/configure b/configure index eb067295..dc82c378 100755 --- a/configure +++ b/configure @@ -20213,7 +20213,7 @@ if test "$GCC" != yes; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" elif test "$includedir" != "/usr/include"; then if test "$includedir" = '${prefix}/include' ; then - if test x$prefix != /usr ; then + if test x$prefix != x/usr ; then ACPPFLAGS="$ACPPFLAGS -I\${includedir}" fi else diff --git a/dist.mk b/dist.mk index 52c613d2..b9ff8282 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.948 2013/10/12 16:11:35 tom Exp $ +# $Id: dist.mk,v 1.949 2013/10/14 08:22:29 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 = 20131012 +NCURSES_PATCH = 20131014 # 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 8b5c290a..61fc90aa 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20131012) unstable; urgency=low +ncurses6 (5.9-20131014) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 12 Oct 2013 19:17:29 -0400 + -- Thomas E. Dickey Mon, 14 Oct 2013 04:22:29 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 8b5c290a..61fc90aa 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20131012) unstable; urgency=low +ncurses6 (5.9-20131014) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 12 Oct 2013 19:17:29 -0400 + -- Thomas E. Dickey Mon, 14 Oct 2013 04:22:29 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index c905d8c4..388ae015 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20131012) unstable; urgency=low +ncurses6 (5.9-20131014) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 12 Oct 2013 12:11:35 -0400 + -- Thomas E. Dickey Mon, 14 Oct 2013 04:22:29 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 67cb268e..d2b6b947 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.4 2013/10/12 23:13:27 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.5 2013/10/14 08:22:29 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 "2013" -!define VERSION_MMDD "1012" +!define VERSION_MMDD "1014" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 74e30e53..ab197b55 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Release: 5.9 -Version: 20131012 +Version: 20131014 License: X11 Group: Development/Libraries Source: ncurses-%{release}-%{version}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index d3e32dfb..4ed840a8 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Release: 5.9 -Version: 20131012 +Version: 20131014 License: X11 Group: Development/Libraries Source: ncurses-%{release}-%{version}.tgz