ncurses 6.1 - patch 20191005

+ modify the ncurse*-config and pc-files to more closely match for the
  -I and -l options.

diff --git a/NEWS b/NEWS
index f5a22c165a47a6996945fcd2a0e40fcefe96fdc8..ea31648af340e463a5c81080a9d4cad02dc5675b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3380 2019/09/28 12:57:39 tom Exp $
+-- $Id: NEWS,v 1.3382 2019/10/05 22:53:18 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.
 
+20191005
+       + modify the ncurse*-config and pc-files to more closely match for the
+         -I and -l options.
+
 20190928
        + amend the ncurse*-config and pc-files to take into account the rpath
          hack which differed between those files.

diff --git a/VERSION b/VERSION
index 4e0166119a3fb9ec328f027e0262166b28800044..aec564a4aede679b97aa5e0a4914d5ec8d3778f3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20190928
+5:0:10 6.1     20191005

diff --git a/dist.mk b/dist.mk
index 397ae03aab07d9538b5e0a7a144553b2c1869b2b..1994b91c8d038046fb9d4844016c51fab740d8b2 100644 (file)
--- 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.1307 2019/09/27 18:43:59 tom Exp $
+# $Id: dist.mk,v 1.1308 2019/10/05 14:44:23 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 = 6
 NCURSES_MINOR = 1
-NCURSES_PATCH = 20190928
+NCURSES_PATCH = 20191005
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index aacd681a743d8aaad93972eb44aa7fed612dda90..6d975ea86492faa2cd2a8a679cc33d77d231e4e4 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.36 2019/09/28 12:53:53 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.38 2019/10/05 22:25:47 tom Exp $
 ##############################################################################
 # Copyright (c) 2009-2018,2019 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -70,11 +70,11 @@ CFLAGS="@PKG_CFLAGS@"
 if [ "$includedir" != "/usr/include" ]; then
        includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
        [ "$includetop" = "/usr/include" ] && includetop="$includedir"
+       CFLAGS="$CFLAGS -I\${includedir}"
        if [ "x$includetop" != "x$includedir" ]
        then
                CFLAGS="$CFLAGS -I${includetop}"
        fi
-       CFLAGS="$CFLAGS -I\${includedir}"
 fi
 
 LDFLAGS=
@@ -106,6 +106,7 @@ do
        if [ $name = $MAIN_LIBRARY ]; then
                desc="$desc library"
                [ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX"
+               [ -n "@LIBS@" ] && LIBS="$LIBS @LIBS@"
        elif [ $name = $SUB_LIBRARY ]; then
                desc="$desc terminal interface library"
        elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 1054408178925cae3f2d83095ce1855640548085..e95227e3f3dc2d343723cbc990fa16ad7a061314 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,5 +1,5 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.39 2019/09/28 12:54:17 tom Exp $
+# $Id: ncurses-config.in,v 1.40 2019/10/05 22:24:20 tom Exp $
 ##############################################################################
 # Copyright (c) 2006-2018,2019 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -86,7 +86,7 @@ if [ x@WITH_OVERWRITE@ = xno ]; then
        esac
 fi
 
-LIBS="@LIBS@ @PRIVATE_LIBS@"
+LIBS="@LIBS@"
 if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
        LIBS="-l${THIS} $LIBS"
 else

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 383661a5aeab62efb472ada3c85059834c16a27e..0113008b733a7d2cc11da45b70757898b8da5175 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190928) unstable; urgency=low
+ncurses6 (6.1+20191005) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2019 14:43:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Oct 2019 10:44:23 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 383661a5aeab62efb472ada3c85059834c16a27e..0113008b733a7d2cc11da45b70757898b8da5175 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190928) unstable; urgency=low
+ncurses6 (6.1+20191005) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2019 14:43:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Oct 2019 10:44:23 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 953ec0f924a6ff0ec41f659d589d6d7b81387ffa..bb15b864c86ec44c12579a4ec33c8de679c8cff2 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190928) unstable; urgency=low
+ncurses6 (6.1+20191005) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 22 Sep 2019 14:43:59 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 05 Oct 2019 10:44:23 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 2c5242c8b24a005d195120e7ad7e385c0f397ece..ca9eae5fd40bd43806f90c11d7458f986fc97ae1 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.353 2019/09/27 18:43:59 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.354 2019/10/05 14:44:23 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2019"\r
-!define VERSION_MMDD  "0928"\r
+!define VERSION_MMDD  "1005"\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 0af8c29635591bb8acfd8c26a9fac73261bdf5ee..a666beff2c165de1b248ba68c5b0e7a92a6ae59a 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: 6.1
-Release: 20190928
+Release: 20191005
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index cca5a1c9ee0340be75c047f72421ea4d18c443bb..ed83905d6ea56513e8e0e2d1db8f9c7a66bc9ebc 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20190928
+Release: 20191005
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index 989481e63e8c74c1447a45d759280cb2683f7bc6..6c7b9a032ded9bb43fdff502d674c378dcda0587 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
-Release: 20190928
+Release: 20191005
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz