+ correct/simplify ifdef's for cur_term versus broken-linker and
reentrant options (report by Jean-Pierre Flori, cf:
20090530).
+ modify release/version combinations in test build-scripts to make
them more consistent with other packages.
14 files changed:
-# $Id: make-tar.sh,v 1.12 2011/03/26 19:07:38 tom Exp $
+# $Id: make-tar.sh,v 1.14 2013/10/26 23:10:24 tom Exp $
##############################################################################
##############################################################################
-# Copyright (c) 2010,2011 Free Software Foundation, Inc. #
+# Copyright (c) 2010-2011,2013 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"), #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
make_changelog() {
test -f $1 && chmod u+w $1
cat >$1 <<EOF
make_changelog() {
test -f $1 && chmod u+w $1
cat >$1 <<EOF
-`echo $PKG_NAME|tr '[A-Z]' '[a-z]'` ($NCURSES_PATCH) unstable; urgency=low
+`echo $PKG_NAME|tr '[A-Z]' '[a-z]'` ($NCURSES_MAJOR.$NCURSES_MINOR-$NCURSES_PATCH) unstable; urgency=low
* snapshot of ncurses subpackage for $PKG_NAME.
* snapshot of ncurses subpackage for $PKG_NAME.
- -- `head -1 $HOME/.signature` `date -R`
+ -- `head -n 1 $HOME/.signature` `date -R`
do
edit_specfile $spec
done
do
edit_specfile $spec
done
-make_changelog $BUILD/$ROOTNAME/package/debian/changelog
+for spec in $BUILD/$ROOTNAME/package/debian*
+do
+ make_changelog $spec/changelog
+done
cp -p ../man/MKada_config.in $BUILD/$ROOTNAME/doc/
if test -z "$NO_HTML_DOCS"
cp -p ../man/MKada_config.in $BUILD/$ROOTNAME/doc/
if test -z "$NO_HTML_DOCS"
./test/package/debian/rules
./test/package/debian/source/format
./test/package/debian/watch
./test/package/debian/rules
./test/package/debian/source/format
./test/package/debian/watch
+./test/package/mingw-ncurses-examples.spec
./test/package/ncurses-examples.spec
./test/programs
./test/railroad.c
./test/package/ncurses-examples.spec
./test/programs
./test/railroad.c
-- 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.2122 2013/10/20 00:08:12 tom Exp $
+-- $Id: NEWS,v 1.2126 2013/10/28 00:17:08 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
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.
+20131027
+ + correct/simplify ifdef's for cur_term versus broken-linker and
+ reentrant options (report by Jean-Pierre Flori, cf: 20090530).
+ + modify release/version combinations in test build-scripts to make
+ them more consistent with other packages.
+
20131019
+ add nc_mingw.h to installed headers for MinGW port; needed for
compiling ncurses-examples.
20131019
+ add nc_mingw.h to installed headers for MinGW port; needed for
compiling ncurses-examples.
# 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.950 2013/10/19 18:39:58 tom Exp $
+# $Id: dist.mk,v 1.952 2013/10/27 10:27:05 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
# 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 = 20131019
+NCURSES_PATCH = 20131027
# 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)
****************************************************************************/
/*
****************************************************************************/
/*
- * $Id: curses.priv.h,v 1.527 2013/08/31 17:02:41 tom Exp $
+ * $Id: curses.priv.h,v 1.528 2013/10/28 00:02:27 tom Exp $
#define HasTerminal(sp) (((sp) != 0) && (0 != ((sp)->_term)))
#define IsValidScreen(sp) (HasTerminal(sp) && !IsPreScreen(sp))
#define HasTerminal(sp) (((sp) != 0) && (0 != ((sp)->_term)))
#define IsValidScreen(sp) (HasTerminal(sp) && !IsPreScreen(sp))
-#if BROKEN_LINKER || USE_REENTRANT
#define CurTerm _nc_prescreen._cur_term
#else
#define CurTerm cur_term
#define CurTerm _nc_prescreen._cur_term
#else
#define CurTerm cur_term
/****************************************************************************
/****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2012,2013 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 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
#include <curses.priv.h>
#include <termcap.h> /* ospeed */
#include <curses.priv.h>
#include <termcap.h> /* ospeed */
-MODULE_ID("$Id: lib_cur_term.c,v 1.31 2012/11/18 02:12:43 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.32 2013/10/28 00:10:27 tom Exp $")
#undef CUR
#define CUR termp->type.
#undef CUR
#define CUR termp->type.
-#if BROKEN_LINKER && !USE_REENTRANT
-NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
-#elif BROKEN_LINKER || USE_REENTRANT
NCURSES_EXPORT(TERMINAL *)
NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
NCURSES_EXPORT(TERMINAL *)
NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_DCL0)
NCURSES_EXPORT(TERMINAL *)
_nc_get_cur_term(void)
{
NCURSES_EXPORT(TERMINAL *)
_nc_get_cur_term(void)
{
oldterm = cur_term;
if (SP_PARM)
SP_PARM->_term = termp;
oldterm = cur_term;
if (SP_PARM)
SP_PARM->_term = termp;
-#if BROKEN_LINKER && !USE_REENTRANT
- cur_term = termp;
-#else
+#else
+ cur_term = termp;
#endif
if (termp != 0) {
#ifdef USE_TERM_DRIVER
#endif
if (termp != 0) {
#ifdef USE_TERM_DRIVER
TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
#endif
TERMINAL *cur = (
TERMINAL_CONTROL_BLOCK *TCB = (TERMINAL_CONTROL_BLOCK *) termp;
#endif
TERMINAL *cur = (
-#if BROKEN_LINKER && !USE_REENTRANT
- cur_term
-#elif BROKEN_LINKER || USE_REENTRANT
NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG)
#else
cur_term
NCURSES_SP_NAME(_nc_get_cur_term) (NCURSES_SP_ARG)
#else
cur_term
-ncurses6 (5.9-20131019) unstable; urgency=low
+ncurses6 (5.9-20131027) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2013 14:39:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 27 Oct 2013 06:27:05 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
ncurses6 (5.9-20131005) unstable; urgency=low
-ncurses6 (5.9-20131019) unstable; urgency=low
+ncurses6 (5.9-20131027) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2013 14:39:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 27 Oct 2013 06:27:05 -0400
ncurses6 (5.9-20131005) unstable; urgency=low
ncurses6 (5.9-20131005) unstable; urgency=low
-ncurses6 (5.9-20131019) unstable; urgency=low
+ncurses6 (5.9-20131027) unstable; urgency=low
- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 19 Oct 2013 14:39:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 27 Oct 2013 06:27:05 -0400
ncurses6 (5.9-20120608) unstable; urgency=low
ncurses6 (5.9-20120608) unstable; urgency=low
-; $Id: mingw-ncurses.nsi,v 1.7 2013/10/19 20:17:03 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.9 2013/10/27 10:27:05 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
!define VERSION_MAJOR "5"\r
!define VERSION_MINOR "9"\r
!define VERSION_YYYY "2013"\r
!define VERSION_MAJOR "5"\r
!define VERSION_MINOR "9"\r
!define VERSION_YYYY "2013"\r
-!define VERSION_MMDD "1019"\r
+!define VERSION_MMDD "1027"\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
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
-Release: 5.9
-Version: 20131019
+Version: 5.9
+Release: 20131027
License: X11
Group: Development/Libraries
License: X11
Group: Development/Libraries
-Source: ncurses-%{release}-%{version}.tgz
+Source: ncurses-%{version}-%{release}.tgz
# URL: http://invisible-island.net/ncurses/
BuildRequires: mingw32-filesystem >= 95
# URL: http://invisible-island.net/ncurses/
BuildRequires: mingw32-filesystem >= 95
--without-tests
%define debug_package %{nil}
--without-tests
%define debug_package %{nil}
-%setup -q -n ncurses-%{release}-%{version}
+%setup -q -n ncurses-%{version}-%{release}
Summary: shared libraries for terminal handling
Name: ncurses6
Summary: shared libraries for terminal handling
Name: ncurses6
-Release: 5.9
-Version: 20131019
+Version: 5.9
+Release: 20131027
License: X11
Group: Development/Libraries
License: X11
Group: Development/Libraries
-Source: ncurses-%{release}-%{version}.tgz
+Source: ncurses-%{version}-%{release}.tgz
# URL: http://invisible-island.net/ncurses/
%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
# URL: http://invisible-island.net/ncurses/
%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
%prep
%define debug_package %{nil}
%prep
%define debug_package %{nil}
-%setup -q -n ncurses-%{release}-%{version}
+%setup -q -n ncurses-%{version}-%{release}
%build
CFLAGS="%{CC_NORMAL}" \
%build
CFLAGS="%{CC_NORMAL}" \
* Sat Mar 09 2013 Thomas E. Dickey
- add --with-cxx-shared option to demonstrate c++ binding as shared library
* Sat Mar 09 2013 Thomas E. Dickey
- add --with-cxx-shared option to demonstrate c++ binding as shared library
-* Sat Oct 26 2012 Thomas E. Dickey
+* Sat Oct 27 2012 Thomas E. Dickey
- add ncurses program as "ncurses6" to provide demonstration.
* Fri Jun 08 2012 Thomas E. Dickey
- add ncurses program as "ncurses6" to provide demonstration.
* Fri Jun 08 2012 Thomas E. Dickey
-# $Id: make-tar.sh,v 1.10 2011/03/26 20:46:51 tom Exp $
+# $Id: make-tar.sh,v 1.12 2013/10/26 23:11:43 tom Exp $
##############################################################################
##############################################################################
-# Copyright (c) 2010,2011 Free Software Foundation, Inc. #
+# Copyright (c) 2010-2011,2013 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"), #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
# copy of this software and associated documentation files (the "Software"), #
make_changelog() {
test -f $1 && chmod u+w $1
cat >$1 <<EOF
make_changelog() {
test -f $1 && chmod u+w $1
cat >$1 <<EOF
-`echo $PKG_NAME|tr '[A-Z]' '[a-z]'` ($NCURSES_PATCH) unstable; urgency=low
+`echo $PKG_NAME|tr '[A-Z]' '[a-z]'` ($NCURSES_MAJOR.$NCURSES_MINOR-$NCURSES_PATCH) unstable; urgency=low
* snapshot of ncurses subpackage for $PKG_NAME.
* snapshot of ncurses subpackage for $PKG_NAME.
- -- `head -1 $HOME/.signature` `date -R`
+ -- `head -n 1 $HOME/.signature` `date -R`
do
edit_specfile $spec
done
do
edit_specfile $spec
done
-make_changelog $BUILD/$ROOTNAME/package/debian/changelog
+for spec in $BUILD/$ROOTNAME/package/debian*
+do
+ make_changelog $spec/changelog
+done
cp -p $SOURCE/NEWS $BUILD/$ROOTNAME
cp -p $SOURCE/NEWS $BUILD/$ROOTNAME
+Summary: ncurses-examples - example/test programs from ncurses
%?mingw_package_header
%define AppProgram ncurses-examples
%?mingw_package_header
%define AppProgram ncurses-examples
-# $Id: mingw-ncurses-examples.spec,v 1.1 2013/10/19 22:04:58 tom Exp $
-Summary: shared libraries for terminal handling
+%define AppVersion MAJOR.MINOR
+%define AppRelease YYYYMMDD
+# $Id: mingw-ncurses-examples.spec,v 1.3 2013/10/26 23:30:21 tom Exp $
Name: mingw32-ncurses6-examples
Name: mingw32-ncurses6-examples
-Release: 5.9
-Version: 20131019
+Version: %{AppVersion}
+Release: %{AppRelease}
License: X11
Group: Development/Libraries
License: X11
Group: Development/Libraries
-Source: ncurses-examples-%{version}.tgz
+Source: ncurses-examples-%{release}.tgz
# URL: http://invisible-island.net/ncurses/
BuildRequires: mingw32-ncurses6
# URL: http://invisible-island.net/ncurses/
BuildRequires: mingw32-ncurses6
--verbose
%define debug_package %{nil}
--verbose
%define debug_package %{nil}
-%setup -q -n ncurses-examples-%{version}
+%setup -q -n ncurses-examples-%{release}