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

Keith Packard keithp at keithp.com
Wed Feb 29 00:49:37 PST 2012


 debian/control |    2 +-
 debian/rules   |    4 +++-
 file.c         |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 9c31311a34a7f6f6751a23eaf439ee1ef40890a9
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Feb 29 21:48:16 2012 +1300

    Clean up some debian lintian warnings
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/debian/control b/debian/control
index e636f24..35fdb71 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: interpreters
 Priority: optional
 Maintainer: Keith Packard <keithp at keithp.com>
 Build-Depends: debhelper (>= 7), libreadline-dev 
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 
 Package: nickle
 Architecture: any
diff --git a/debian/rules b/debian/rules
index a24c3fd..c98201c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,9 @@ configure-stamp:
 	./configure --prefix=/usr --mandir='$${prefix}/share/man'
 	touch configure-stamp
 
-build: configure-stamp build-stamp
+build: configure-stamp build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
 	dh_testdir
 	$(MAKE)
commit 8c1b5242e3605cf356c8c1643a415bc0f585c7d3
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Feb 29 21:47:16 2012 +1300

    Fix new FileVPrintf 'G' format comparison
    
    Was comparing the pointer to the representation enum. oops.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/file.c b/file.c
index 57e107d..d088d44 100644
--- a/file.c
+++ b/file.c
@@ -1812,7 +1812,7 @@ FileVPrintf (Value file, char *fmt, va_list args)
 		if (!v)
 		    (void) FilePuts (file, "<uninit>");
 		else {
-		    if (ValueRep(v) <= rep_void) {
+		    if (ValueRep(v)->tag <= rep_void) {
 			Print (file, v, 'g', 0, 0, DEFAULT_OUTPUT_PRECISION, ' ');
 		    } else {
 			(void) FilePuts (file, "<composite>");


More information about the Nickle mailing list