[Nickle] nickle: Branch 'master' - 6 commits

[Keith Packard]

 .gitignore            |    1 +
 configure.in          |    7 +++----
 debian/changelog      |   11 +++++++++++
 debian/control        |   12 ++++++------
 debian/rules          |    2 +-
 examples/fourfours.5c |    1 -
 rational.c            |    2 +-
 7 files changed, 23 insertions(+), 13 deletions(-)

New commits:
commit 68dfd4a10fc2c88b7618505b3c54e11ee4def1ee
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sun Sep 23 21:18:31 2007 -0700

    Update debian bits to 2.59

diff --git a/debian/changelog b/debian/changelog
index 0afbd0a..5c0c7f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nickle (2.59-1) unstable; urgency=low
+  * Bump to version 2.59
+  * Have git ignore nickle binary
+  * Clean up some autotools warnings
+  * Make default rational display not include braces
+  * Clean up some lintian warnings
+  * Construct ChangeLog from git history for distribution.
+  * No tail calls without a parent frame
+
+ -- Keith Packard <keithp at keithp.com>  Sun, 23 Sep 2007 21:16:34 -0700
+ 
 nickle (2.58-1) unstable; urgency=low
   * CCITT/ITU CRC-32 computation example
   * changed import PRNG to autoimport
commit fca9c9e60a67f9b4cb3bbf2d5305f9a95da6d1f5
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sun Sep 23 21:12:01 2007 -0700

    Bump to version 2.59

diff --git a/configure.in b/configure.in
index 95b5aef..4e8329c 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ dnl for licensing information.
 AC_PREREQ(2.59)
 
 AC_INIT([nickle],
-	2.58,
+	2.59,
 	[http://nickle.org],
 	nickle)
 
commit fb835ca271df82ce282360a45937e4d4b2f8436f
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sun Sep 23 21:10:30 2007 -0700

    Have git ignore nickle binary

diff --git a/.gitignore b/.gitignore
index 51370f4..0ec1e2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ stamp-h1
 version-sh
 nickle-[1-9].*
 nickle_[1-9].*
+nickle
commit 27873b849950eace51db8b02491f06cc0f0ec43c
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sun Sep 23 21:07:48 2007 -0700

    Clean up some autotools warnings

diff --git a/configure.in b/configure.in
index 9b25bb8..95b5aef 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
 
-AM_INIT_AUTOMAKE()
+AM_INIT_AUTOMAKE([foreign])
 
 AM_MAINTAINER_MODE
 
@@ -24,7 +24,6 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PROG_LEX
-AC_PROG_RANLIB
 dnl AC_PROG_YACC
 AC_CHECK_PROGS([YACC], byacc yacc bison, yacc)
 case "$YACC" in
@@ -45,7 +44,7 @@ dnl autostars m4 macro for detection of compiler flags
 dnl
 dnl ds at schleef.org
 
-AC_DEFUN(AS_COMPILER_FLAG,
+AC_DEFUN([AS_COMPILER_FLAG],
 [
   AC_MSG_CHECKING(to see if compiler understands $1)
 
commit 02f2eb1115ba8b7541e8448959b0357be4c89905
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sun Sep 23 20:58:09 2007 -0700

    Make default rational display not include braces

diff --git a/rational.c b/rational.c
index 0fa9bd2..a6c71d5 100644
--- a/rational.c
+++ b/rational.c
@@ -762,7 +762,7 @@ RationalDecimalPrint (Value f, Value rv, char format, int base, int width, int p
     Bool	use_braces = True;
 
     min_prec = 0;
-    if (format == 'f' || format == 'e')
+    if (format == 'f' || format == 'e' || format == 'g')
     {
 	min_prec = prec;
 	use_braces = False;
commit 2bccdfcbbc85a86e544af1dd4f4e7756bd1f953a
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Sun Sep 23 20:46:52 2007 -0700

    Clean up some lintian warnings

diff --git a/debian/control b/debian/control
index d8478c0..fdca75a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,9 @@ Package: nickle
 Architecture: any
 Depends: ${shlibs:Depends} ${misc:Depends}
 Description: desk calculator language
- Nickle is a desk calculator language with powerful programming and scripting
- capabilities.  Nickle supports a variety of datatypes, especially arbitrary
- precision integers, rationals, and imprecise reals.  The input language
- vaguely resembles C.  Some things in C which do not translate easily are
- different, some design choices have been made differently, and a very few
- features are simply missing.
+ Nickle is a language with powerful programming and scripting capabilities.
+ Nickle supports a variety of datatypes, especially arbitrary precision
+ integers, rationals, and imprecise reals.  The input language vaguely
+ resembles C.  Some things in C which do not translate easily are different,
+ some design choices have been made differently, and a very few features are
+ simply missing.
diff --git a/debian/rules b/debian/rules
index 8e0b641..e53b769 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-	-$(MAKE) distclean
+	if test -f Makefile; then $(MAKE) distclean; else true; fi
 	dh_clean
 
 install: build
diff --git a/examples/fourfours.5c b/examples/fourfours.5c
index 4b290b0..e9233ab 100644
--- a/examples/fourfours.5c
+++ b/examples/fourfours.5c
@@ -1,4 +1,3 @@
-#!/usr/bin/env nickle
 #
 # Using four '4's, find
 # equations using unary and binary operators