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

[Keith Packard]

 configure.ac     |    2 +-
 debian/changelog |   11 +++++++++++
 nickle.spec.in   |    3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 73d8de9c965de8329ee50391665d5cc359049273
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Nov 6 11:23:42 2012 -0800

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

diff --git a/configure.ac b/configure.ac
index 7b6e22f..23e55c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl for licensing information.
 
 AC_PREREQ([2.64])
 
-AC_INIT([nickle],[2.76],[http://nickle.org],[nickle])
+AC_INIT([nickle],[2.77],[http://nickle.org],[nickle])
 
 AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([config.h])
diff --git a/debian/changelog b/debian/changelog
index 595fe5e..13a7111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nickle (2.77-1) unstable; urgency=low
+
+  * Build tutorial when docbook2pdf is available
+  * tutorial: Use sgml entities instead of < and >
+  * Tutorial: twixt doesn't have an optional 'else' block
+  * Rename nickle tutorial to nickle-tutorial
+  * Corrected some Nickle Tour nits
+  * Handle OpFarJump in CompileReachable
+
+ -- Keith Packard <keithp at keithp.com>  Tue, 06 Nov 2012 11:04:49 -0800
+
 nickle (2.76-1) unstable; urgency=low
 
   * Fix FTBS on Hurd-i386.
commit 9be5752d7c3af90aa006be7aa050e881916b3239
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Nov 6 11:20:04 2012 -0800

    Fix RPM spec file to not install tutorial twice
    
    By default, the tutorial gets stuck in /usr/share/doc/nickle, while
    rpm wants it in /usr/shar/doc/nickle-<version>. Ignore the one in /usr/share/doc/nickle.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/nickle.spec.in b/nickle.spec.in
index 5eeb228..e33fe9e 100644
--- a/nickle.spec.in
+++ b/nickle.spec.in
@@ -35,13 +35,14 @@ cp -R examples $RPM_BUILD_ROOT%{_datadir}/nickle/
 
 %files
 %defattr(-,root,root)
-%doc README README.name COPYING AUTHORS INSTALL NEWS TODO
+%doc README README.name COPYING AUTHORS INSTALL NEWS TODO doc/tutorial/nickle-tutorial.pdf
 %attr(755,root,root) %{_bindir}/nickle
 %dir %{_datadir}/nickle
 %{_mandir}/man1/nickle.1*
 %{_datadir}/nickle/*
 %dir %{_includedir}/nickle
 %{_includedir}/nickle/*
+%exclude %{_datadir}/doc/nickle/*
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT