From cc2f6f7b85f968a62c2577287039c1946a66eec3 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Fri, 27 Sep 2013 02:03:50 -0700 Subject: [PATCH] Release calc version 2.12.4.13 --- CHANGES | 9 +++++++-- Makefile | 6 +++--- Makefile.simple | 6 +++--- cal/lucas.cal | 13 +++---------- custom/Makefile | 6 +++--- custom/Makefile.head | 6 +++--- custom/Makefile.simple | 6 +++--- version.c | 6 +++--- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/CHANGES b/CHANGES index b6d0e1a..b6cd55c 100644 --- a/CHANGES +++ b/CHANGES @@ -72,6 +72,11 @@ The following are the changes from calc version 2.12.4.11 to date: The detaillist make target in help/Makefile is now called detail_help_list. + Removed requirement of gen_u0(h, n, v1) in lucas.cal that h + be odd. While still lucas(h, n) converts even h into an odd h + internally by incrementing n, gen_u0(h, n, v1) will output even + when h is even. + The following are the changes from calc version 2.12.4.6 to version 2.12.4.10: @@ -6955,8 +6960,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. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ## -## @(#) $Revision: 30.37 $ -## @(#) $Id: CHANGES,v 30.37 2013/09/02 02:31:57 chongo Exp $ +## @(#) $Revision: 30.38 $ +## @(#) $Id: CHANGES,v 30.38 2013/09/27 08:59:43 chongo Exp $ ## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/Makefile b/Makefile index 34cd63b..745c031 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,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: 30.59 $$ -# @(#) $Id: Makefile.ship,v 30.59 2013/09/01 23:02:02 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.60 $$ +# @(#) $Id: Makefile.ship,v 30.60 2013/09/27 08:55:27 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -997,7 +997,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.12 +VERSION= 2.12.4.13 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/Makefile.simple b/Makefile.simple index f33e833..d0a954c 100644 --- a/Makefile.simple +++ b/Makefile.simple @@ -39,8 +39,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: 30.59 $$ -# @(#) $Id: Makefile.ship,v 30.59 2013/09/01 23:02:02 chongo Exp $ +MAKEFILE_REV= $$Revision: 30.60 $$ +# @(#) $Id: Makefile.ship,v 30.60 2013/09/27 08:55:27 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $ # # Under source code control: 1990/02/15 01:48:41 @@ -974,7 +974,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.12 +VERSION= 2.12.4.13 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/cal/lucas.cal b/cal/lucas.cal index 24ba911..f5c7f69 100644 --- a/cal/lucas.cal +++ b/cal/lucas.cal @@ -17,8 +17,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.1 $ - * @(#) $Id: lucas.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $ + * @(#) $Revision: 30.2 $ + * @(#) $Id: lucas.cal,v 30.2 2013/09/27 08:58:46 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/lucas.cal,v $ * * Under source code control: 1990/05/03 16:49:51 @@ -442,7 +442,7 @@ lucas(h, n) * See the function gen_v1() for details on the value of v(1). * * input: - * h - h as in h*2^n-1 (h mod 2 != 0) + * h - h as in h*2^n-1 * n - n as in h*2^n-1 * v1 - gen_v1(h,n) (see function below) * @@ -475,13 +475,6 @@ gen_u0(h, n, v1) quit "bogus arg: v1 is <= 0"; } - /* - * enforce the h mod rules - */ - if (h%2 == 0) { - quit "h must not be even"; - } - /* * enforce the h > 0 and n >= 2 rules */ diff --git a/custom/Makefile b/custom/Makefile index 3acdcbe..cbff418 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.30 $ -# @(#) $Id: Makefile.head,v 30.30 2013/09/01 23:02:02 chongo Exp $ +# @(#) $Revision: 30.31 $ +# @(#) $Id: Makefile.head,v 30.31 2013/09/27 08:55:28 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -366,7 +366,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.12 +VERSION= 2.12.4.13 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/custom/Makefile.head b/custom/Makefile.head index 7ca8915..69f05af 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.30 $ -# @(#) $Id: Makefile.head,v 30.30 2013/09/01 23:02:02 chongo Exp $ +# @(#) $Revision: 30.31 $ +# @(#) $Id: Makefile.head,v 30.31 2013/09/27 08:55:28 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -366,7 +366,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.12 +VERSION= 2.12.4.13 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/custom/Makefile.simple b/custom/Makefile.simple index 83728d5..9af7e5d 100644 --- a/custom/Makefile.simple +++ b/custom/Makefile.simple @@ -18,8 +18,8 @@ # received a copy with calc; if not, write to Free Software Foundation, Inc. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# @(#) $Revision: 30.30 $ -# @(#) $Id: Makefile.head,v 30.30 2013/09/01 23:02:02 chongo Exp $ +# @(#) $Revision: 30.31 $ +# @(#) $Id: Makefile.head,v 30.31 2013/09/27 08:55:28 chongo Exp $ # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $ # # Under source code control: 1997/03/09 02:28:54 @@ -351,7 +351,7 @@ EXT= # The default calc versions # -VERSION= 2.12.4.12 +VERSION= 2.12.4.13 VERS= 2.12.4 VER= 2.12 VE= 2 diff --git a/version.c b/version.c index 623339e..fd25f8e 100644 --- a/version.c +++ b/version.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * @(#) $Revision: 30.21 $ - * @(#) $Id: version.c,v 30.21 2013/09/02 00:00:59 chongo Exp $ + * @(#) $Revision: 30.22 $ + * @(#) $Id: version.c,v 30.22 2013/09/27 08:59:43 chongo Exp $ * @(#) $Source: /usr/local/src/bin/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -49,7 +49,7 @@ static char *program; #define MAJOR_VER 2 /* major library version */ #define MINOR_VER 12 /* minor library version */ #define MAJOR_PATCH 4 /* major software level under library version */ -#define MINOR_PATCH 12 /* minor software level or 0 if not patched */ +#define MINOR_PATCH 13 /* minor software level or 0 if not patched */ /*