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

Keith Packard keithp at keithp.com
Wed Mar 22 23:52:03 PDT 2017


Rebased ref, commits from common ancestor:
commit b03fa4fcfe5e8bca6552c8be83eb5c67180b7f8a
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Mar 23 07:49:45 2017 +0100

    Fix a pile of lintian warnings
    
    Update to standard 3.9.8 and dh 10.
    COPYING files from exmaples shouldn't be installed.
    Use 3.0 (quilt) format so we can have a packaging revision with dh 10.
    Get the tutorial installed correctly.
    Mark the sudoku example script executable.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/debian/changelog b/debian/changelog
index 7c3ad4c..dd9e0be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nickle (2.79-2) unstable; urgency=low
+
+  * Update to standards 3.9.8
+  * Switch to 3.0 (quilt) format
+  * Update to dh version 10
+  * Avoid installing COPYING files which duplicate copyright data
+  * Make examples which are scripts executable
+
+ -- Keith Packard <keithp at keithp.com>  Thu, 23 Mar 2017 07:45:52 +0100
+
 nickle (2.79-1) unstable; urgency=low
 
   * Fix bus error on sparc64 due to unaligned DataCache.
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index c285cfe..fb1bff1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: nickle
 Section: interpreters
 Priority: optional
 Maintainer: Keith Packard <keithp at keithp.com>
-Build-Depends: debhelper (>= 7.0.50), libreadline-dev, autotools-dev, docbook-utils, bison, flex
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 10), libreadline-dev, autotools-dev, docbook-utils, bison, flex
+Standards-Version: 3.9.8
 
 Package: nickle
 Architecture: any
diff --git a/debian/docs b/debian/docs
index 76399c4..8e882f4 100644
--- a/debian/docs
+++ b/debian/docs
@@ -5,4 +5,4 @@ TODO
 examples
 test
 bench
-tutorial.pdf
+doc/tutorial/nickle-tutorial.pdf
diff --git a/debian/rules b/debian/rules
index b8478dc..d6438fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,3 +16,11 @@ configure_flags = --mandir='$${prefix}/share/man'
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(configure_flags)
+
+
+# Don't install duplicate copyright info from COPYING files
+# Make examples which happen to start with #! executable
+
+override_dh_auto_install:
+	dh_auto_install && (find debian/nickle -name COPYING -print0 | xargs -0 rm)
+	find debian/nickle/usr/share/nickle -type f -print0 | xargs -0 grep -l '^#!.*nickle' | xargs -d '\n' chmod +x
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
commit 62538ae681138311fdb0d60419049dee291e4b4e
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Mar 23 06:45:53 2017 +0100

    Update to version 2.79
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index ba9d7ce..7a51231 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ dnl for licensing information.
 
 AC_PREREQ([2.69])
 
-AC_INIT([nickle],[2.78],[http://nickle.org],[nickle])
-RELEASE_DATE="2017-03-15"
+AC_INIT([nickle],[2.79],[http://nickle.org],[nickle])
+RELEASE_DATE="2017-03-16"
 AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
diff --git a/debian/changelog b/debian/changelog
index d550556..7c3ad4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nickle (2.79-1) unstable; urgency=low
+
+  * Fix bus error on sparc64 due to unaligned DataCache.
+
+ -- Keith Packard <keithp at keithp.com>  Thu, 16 Mar 2017 10:52:49 -0700
+
 nickle (2.78-1) unstable; urgency=low
 
   * Add sudoku generator and solver example.


More information about the Nickle mailing list