diff --git a/CHANGES b/CHANGES index 7f2d0e5..72696b6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -The following are the changes from calc version 2.12.1.7 to date: +The following are the changes from calc version 2.12.2 to date: Fixed calc cscripts that contained comments that were not valid calc comments. Improved calc comment documentation in "help unexpected" @@ -35,8 +35,6 @@ The following are the changes from calc version 2.12.1.7 to date: The "help define" command is now equivalent to "help command". Fixed calc command line usage message. - - Fixed missing README.src file in RPM src and tgz src tarball. The following are the changes from calc version 2.12.1.6 to 2.12.1.6: @@ -6320,8 +6318,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.94 $ -## @(#) $Id: CHANGES,v 29.94 2007/02/07 01:38:03 chongo Exp $ +## @(#) $Revision: 29.93 $ +## @(#) $Id: CHANGES,v 29.93 2007/02/07 00:41:06 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/cscript/Makefile b/cscript/Makefile index 7620af7..fe43aa8 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.29 $ +# @(#) $Id: Makefile,v 29.29 2007/02/07 00:31:59 chongo Exp $ # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $ # # Under source code control: 1999/11/29 11:10:26 @@ -199,7 +199,7 @@ SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \ # These files are found (but not built) in the distribution # -DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} README.src +DISTLIST= ${SCRIPT_SRC} ${MAKE_FILE} README # These files are used to make (but not build) a calc .a library # diff --git a/cscript/README.src b/cscript/README similarity index 96% rename from cscript/README.src rename to cscript/README index 5532426..4e4de8f 100644 --- a/cscript/README.src +++ b/cscript/README @@ -7,7 +7,7 @@ be useful! Please note that calc shell scripts must start with the line: - #!/usr/local/src/cmd/calc/calc -q -f + #!/usr/bin/calc -q -f The above line MUST start in column 1 of the first line. The first line must also end in -f. The -q is optional, but is recommended to disable @@ -18,7 +18,7 @@ Comments must be /* c-like comment */ or start with a double ## symbol. This is the correct way to form a calc shell script: - #!/usr/local/src/cmd/calc/calc -q -f + #!/usr/bin/calc -q -f /* a correct comment */ ## another correct comment @@ -36,7 +36,7 @@ For more informaton about calc command lines, see "help usage". This next example WRONG: - #!/usr/local/src/cmd/calc/calc -q + #!/usr/bin/calc -q # This is not a calc calc comment because it has only a single # # You must to start comments with ## or /* diff --git a/version.c b/version.c index ac49d0e..cfdbdce 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.74 $ - * @(#) $Id: version.c,v 29.74 2007/02/07 01:37:07 chongo Exp $ + * @(#) $Revision: 29.73 $ + * @(#) $Id: version.c,v 29.73 2007/02/07 00:41:06 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 8 /* test number or 0 if no minor patch */ +#define MINOR_PATCH 7 /* test number or 0 if no minor patch */ /*