From b8da182f141a5d0e6bd6a7758a1c100ba4172610 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 19 Jan 2014 00:49:51 +0000 Subject: [PATCH] ncurses 5.9 - patch 20140118 + apply includesubdir variable which was introduced in 20130805 to gen-pkgconfig.in (Debian #735782). --- COPYING | 4 ++-- Makefile.in | 20 ++++++++++---------- NEWS | 8 ++++++-- dist.mk | 6 +++--- misc/gen-pkgconfig.in | 10 ++++------ package/debian-mingw/changelog | 4 ++-- package/debian-mingw/copyright | 4 ++-- package/debian-mingw64/changelog | 4 ++-- package/debian-mingw64/copyright | 4 ++-- package/debian/changelog | 4 ++-- package/debian/copyright | 4 ++-- package/mingw-ncurses.nsi | 6 +++--- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- 14 files changed, 42 insertions(+), 40 deletions(-) diff --git a/COPYING b/COPYING index 48e6cd43..6e3b3948 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. +Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -25,4 +25,4 @@ sale, use or other dealings in this Software without prior written authorization. -- vile:txtmode fc=72 --- $Id: COPYING,v 1.1 2013/10/12 17:01:03 tom Exp $ +-- $Id: COPYING,v 1.2 2014/01/18 23:59:29 tom Exp $ diff --git a/Makefile.in b/Makefile.in index 6c5b6f96..803746c2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.37 2013/08/03 22:58:52 tom Exp $ +# $Id: Makefile.in,v 1.38 2014/01/18 20:19:45 tom Exp $ ############################################################################## -# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. # +# Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -27,7 +27,7 @@ # authorization. # ############################################################################## # -# Author: Thomas E. Dickey 1996,1997 +# Author: Thomas E. Dickey 1996-on # # Master Makefile for ncurses library. @@ -58,7 +58,7 @@ includesubdir = @includesubdir@ libdir = @libdir@ mandir = @mandir@ -INCLUDEDIR = ${DESTDIR}${includedir}${includesubdir} +include_dir = ${includedir}${includesubdir} INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -79,17 +79,17 @@ preinstall : @ echo '' @ echo ' bin directory: '$(bindir) @ echo ' lib directory: '$(libdir) - @ echo ' include directory: '$(INCLUDEDIR) + @ echo ' include directory: '$(include_dir) @ echo ' man directory: '$(mandir) @MAKE_TERMINFO@ @ echo ' terminfo directory: '$(ticdir) @ echo '' - @ test "$(INCLUDEDIR)" = "$(prefix)/include" || \ + @ test "$(include_dir)" = "$(prefix)/include" || \ echo '** Include-directory is not in a standard location' - @ test ! -f $(INCLUDEDIR)/termcap.h || \ - fgrep NCURSES_VERSION $(INCLUDEDIR)/termcap.h >/dev/null || \ + @ test ! -f $(include_dir)/termcap.h || \ + fgrep NCURSES_VERSION $(include_dir)/termcap.h >/dev/null || \ echo '** Will overwrite non-ncurses termcap.h' - @ test ! -f $(INCLUDEDIR)/curses.h || \ - fgrep NCURSES_VERSION $(INCLUDEDIR)/curses.h >/dev/null || \ + @ test ! -f $(include_dir)/curses.h || \ + fgrep NCURSES_VERSION $(include_dir)/curses.h >/dev/null || \ echo '** Will overwrite non-ncurses curses.h' distclean \ diff --git a/NEWS b/NEWS index aa48d31e..9f3ff1d1 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- -- copy of this software and associated documentation files (the -- @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2151 2013/12/21 22:25:52 tom Exp $ +-- $Id: NEWS,v 1.2155 2014/01/18 23:59:51 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. +20140118 + + apply includesubdir variable which was introduced in 20130805 to + gen-pkgconfig.in (Debian #735782). + 20131221 + further improved man2html, used this to fix broken links in html manpages. See diff --git a/dist.mk b/dist.mk index 453cb06b..17b11010 100644 --- a/dist.mk +++ b/dist.mk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. # +# Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.964 2013/12/21 21:50:22 tom Exp $ +# $Id: dist.mk,v 1.967 2014/01/19 00:00:07 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 = 20131221 +NCURSES_PATCH = 20140118 # 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 9db12572..92fcda68 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,7 +1,7 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.15 2013/03/16 23:33:34 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.16 2014/01/18 20:21:45 tom Exp $ ############################################################################## -# Copyright (c) 2009-2012,2013 Free Software Foundation, Inc. # +# Copyright (c) 2009-2013,2014 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -49,12 +49,12 @@ CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@ prefix="@prefix@" exec_prefix="@exec_prefix@" -includedir="@includedir@" +includedir="@includedir@@includesubdir@" libdir="@libdir@" show_prefix='@prefix@' show_exec_prefix='@exec_prefix@' -show_includedir='@includedir@' +show_includedir='@includedir@@includesubdir@' show_libdir='@libdir@' MAIN_LIBRARY="${LIB_NAME}@DFT_ARG_SUFFIX@" @@ -103,8 +103,6 @@ do echo "** creating ${name}.pc" cat >${name}.pc < Sat, 21 Dec 2013 13:12:41 -0500 + -- Thomas E. Dickey Sat, 18 Jan 2014 10:54:25 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw/copyright b/package/debian-mingw/copyright index 37d57eb9..2b279046 100644 --- a/package/debian-mingw/copyright +++ b/package/debian-mingw/copyright @@ -1,6 +1,6 @@ This package is used for testing builds of ncurses. -Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. +Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. Copyright © 2001 by Pradeep Padala Permission is hereby granted, free of charge, to any person obtaining a @@ -81,7 +81,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Copyright 1996-2012,2013 by Thomas E. Dickey +Copyright 1996-2013,2014 by Thomas E. Dickey All Rights Reserved diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 2d2b3bf6..63263831 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20131221) unstable; urgency=low +ncurses6 (5.9-20140118) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 21 Dec 2013 13:12:41 -0500 + -- Thomas E. Dickey Sat, 18 Jan 2014 10:54:25 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/copyright b/package/debian-mingw64/copyright index 37d57eb9..2b279046 100644 --- a/package/debian-mingw64/copyright +++ b/package/debian-mingw64/copyright @@ -1,6 +1,6 @@ This package is used for testing builds of ncurses. -Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. +Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. Copyright © 2001 by Pradeep Padala Permission is hereby granted, free of charge, to any person obtaining a @@ -81,7 +81,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Copyright 1996-2012,2013 by Thomas E. Dickey +Copyright 1996-2013,2014 by Thomas E. Dickey All Rights Reserved diff --git a/package/debian/changelog b/package/debian/changelog index f4c67784..5dfe40cf 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20131221) unstable; urgency=low +ncurses6 (5.9-20140118) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 21 Dec 2013 13:12:41 -0500 + -- Thomas E. Dickey Sat, 18 Jan 2014 10:54:25 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/debian/copyright b/package/debian/copyright index 37d57eb9..2b279046 100644 --- a/package/debian/copyright +++ b/package/debian/copyright @@ -1,6 +1,6 @@ This package is used for testing builds of ncurses. -Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. +Copyright (c) 1998-2013,2014 Free Software Foundation, Inc. Copyright © 2001 by Pradeep Padala Permission is hereby granted, free of charge, to any person obtaining a @@ -81,7 +81,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Copyright 1996-2012,2013 by Thomas E. Dickey +Copyright 1996-2013,2014 by Thomas E. Dickey All Rights Reserved diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index c6c90ede..d2e5b877 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.19 2013/12/21 18:12:41 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.21 2014/01/18 15:54:25 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -9,8 +9,8 @@ !define VERSION_MAJOR "5" !define VERSION_MINOR "9" -!define VERSION_YYYY "2013" -!define VERSION_MMDD "1221" +!define VERSION_YYYY "2014" +!define VERSION_MMDD "118" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 8faf9726..8929748e 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: 20131221 +Release: 20140118 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index b5d74985..562b1abe 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: 20131221 +Release: 20140118 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.44.0