From 7d0cc52afe9242237b51ffa0fe1b96063bad2cc6 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Thu, 8 Feb 2007 13:25:27 -0800 Subject: [PATCH] Release calc version 2.12.1.10 --- CHANGES | 7 +++++-- Makefile | 6 +++--- cscript/Makefile | 6 +++--- help/builtin.end | 8 ++++---- version.c | 6 +++--- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/CHANGES b/CHANGES index b285153..9db6fb2 100644 --- a/CHANGES +++ b/CHANGES @@ -54,6 +54,9 @@ The following are the changes from calc version 2.12.1.8 to date: not found. This symbol was renamed to MEMMOVE_SIZE_T. Calc requires that size_t must be a known type. + Calc and cscripts are installed mode 0755 instead of 0555 to + make rpmlint happy. + The following are the changes from calc version 2.12.1.6 to 2.12.1.7: @@ -6336,8 +6339,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1: ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ## -## @(#) $Revision: 29.95 $ -## @(#) $Id: CHANGES,v 29.95 2007/02/07 21:28:20 chongo Exp $ +## @(#) $Revision: 29.96 $ +## @(#) $Id: CHANGES,v 29.96 2007/02/08 21:22:43 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/Makefile b/Makefile index d4d5aae..369e20a 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -MAKEFILE_REV= $$Revision: 29.85 $$ -# @(#) $Id: Makefile.ship,v 29.85 2007/02/07 20:35:58 chongo Exp $ +MAKEFILE_REV= $$Revision: 29.86 $$ +# @(#) $Id: Makefile.ship,v 29.86 2007/02/08 21:21:53 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -3740,7 +3740,7 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 else \ ${RM} -f ${T}${BINDIR}/calc.new${EXT}; \ ${CP} -f calc${EXT} ${T}${BINDIR}/calc.new${EXT}; \ - ${CHMOD} 0555 ${T}${BINDIR}/calc.new${EXT}; \ + ${CHMOD} 0755 ${T}${BINDIR}/calc.new${EXT}; \ ${MV} -f ${T}${BINDIR}/calc.new${EXT} ${T}${BINDIR}/calc${EXT}; \ echo "installed ${T}${BINDIR}/calc${EXT}"; \ fi diff --git a/cscript/Makefile b/cscript/Makefile index 7620af7..70a4496 100644 --- a/cscript/Makefile +++ b/cscript/Makefile @@ -17,8 +17,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. # -# @(#) $Revision: 29.31 $ -# @(#) $Id: Makefile,v 29.31 2007/02/07 01:43:56 chongo Exp $ +# @(#) $Revision: 29.32 $ +# @(#) $Id: Makefile,v 29.32 2007/02/08 21:21:25 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $ # # Under source code control: 1999/11/29 11:10:26 @@ -400,7 +400,7 @@ install: all else \ ${RM} -f ${T}${SCRIPTDIR}/$$i.new; \ ${CP} -f $$i ${T}${SCRIPTDIR}/$$i.new; \ - ${CHMOD} 0555 ${T}${SCRIPTDIR}/$$i.new; \ + ${CHMOD} 0755 ${T}${SCRIPTDIR}/$$i.new; \ ${MV} -f ${T}${SCRIPTDIR}/$$i.new ${T}${SCRIPTDIR}/$$i; \ echo "installed ${T}${SCRIPTDIR}/$$i"; \ fi; \ diff --git a/help/builtin.end b/help/builtin.end index fec3d9f..ebadff1 100644 --- a/help/builtin.end +++ b/help/builtin.end @@ -178,7 +178,7 @@ the hash value may change with different versions of the calculator. The base function allows one to specify how numbers should be - printer. The base function provides a numeric shorthand to the + printed. The base function provides a numeric shorthand to the config("mode") interface. With no args, base() will return the current mode. With 1 arg, base(val) will set the mode according to the arg and return the previous mode. @@ -199,7 +199,7 @@ For convenience, any non-integer value is assumed to mean "frac", and any integer >= 2^64 is assumed to mean "exp". -## Copyright (C) 1999 Landon Curt Noll +## Copyright (C) 1999-2007 Landon Curt Noll ## ## Calc is open software; you can redistribute it and/or modify it under ## the terms of the version 2.1 of the GNU Lesser General Public License @@ -215,8 +215,8 @@ ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ## -## @(#) $Revision: 29.2 $ -## @(#) $Id: builtin.end,v 29.2 2000/06/07 14:02:33 chongo Exp $ +## @(#) $Revision: 29.3 $ +## @(#) $Id: builtin.end,v 29.3 2007/02/08 06:25:23 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/builtin.end,v $ ## ## Under source code control: 1995/07/10 01:17:53 diff --git a/version.c b/version.c index f20662f..85b598f 100644 --- a/version.c +++ b/version.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * @(#) $Revision: 29.76 $ - * @(#) $Id: version.c,v 29.76 2007/02/07 21:28:20 chongo Exp $ + * @(#) $Revision: 29.77 $ + * @(#) $Id: version.c,v 29.77 2007/02/08 21:22:43 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -48,7 +48,7 @@ static char *program; #define MAJOR_VER 2 /* major version */ #define MINOR_VER 12 /* minor version */ #define MAJOR_PATCH 1 /* patch level or 0 if no patch */ -#define MINOR_PATCH 9 /* test number or 0 if no minor patch */ +#define MINOR_PATCH 10 /* test number or 0 if no minor patch */ /*