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

[Keith Packard]

 Makefile.am              |   35 +++++------------------------------
 configure.ac             |    4 ++--
 debian/changelog         |    6 ++++++
 doc/tutorial/Makefile.am |    4 +++-
 sort.5c                  |    2 +-
 5 files changed, 17 insertions(+), 34 deletions(-)

New commits:
commit 0ecac7fc45c2e7e71d0bc48735a43e98b48d4f84
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Dec 19 20:44:54 2020 -0800

    Fix release process
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Makefile.am b/Makefile.am
index 35dfa42..26396b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,12 +16,8 @@ NICKLEFILES = builtin.5c math.5c scanf.5c mutex.5c \
 	prime_sieve.5c factorial.5c gamma.5c sort.5c list.5c skiplist.5c \
 	json.5c
 
-DEBIAN = debian/changelog debian/compat debian/source/format debian/watch \
-	 debian/control debian/copyright debian/rules debian/lintian.override \
-	 debian/tests/control debian/tests/upstream debian/upstream/signing-key.asc
-	 
 EXTRA_DIST = README.name README.release autogen.sh ChangeLog \
-	$(NICKLEFILES) $(DEBIAN) nickle.1.in nickle.spec.in
+	$(NICKLEFILES) nickle.1.in nickle.spec.in
 
 MAINTAINERCLEANFILES=ChangeLog
 
@@ -96,31 +92,7 @@ SIGFILE=$(PACKAGE)-$(VERSION).tar.gz.asc
 DEBFILE=$(PACKAGE)_$(VERSION)_amd64.deb
 SRPMFILE=$(RPMDIR)/SRPMS/$(PACKAGE)-$(VERSION)-1.src.rpm
 RPMFILE=$(RPMDIR)/RPMS/$(PACKAGE)-$(VERSION)-1.x86_64.rpm
-RELEASE_FILES = $(TARFILE) $(SIGFILE) $(DEBFILE) $(SRPMFILE) $(RPMFILE)
-DEB_TAR_DIR=$(PACKAGE)_$(VERSION).orig
-DEB_TAR=$(DEB_TAR_DIR).tar.gz
-DEB_SIG=$(DEB_TAR).asc
-
-debuild: $(DEBFILE)
-
-$(DEBFILE): $(DEB_TAR) $(DEB_SIG) $(TARFILE)
-	tar xzf $(TARFILE)
-	(cd $(distdir) && pdebuild --buildresult $(abs_top_builddir) --auto-debsign)
-
-debuild-unsigned: $(DEB_TAR) $(TARFILE)
-	tar xzf $(distdir).tar.gz
-	(cd $(distdir)/debian && debuild -us -uc)
-
-$(DEB_TAR): $(TARFILE)
-	rm -f $@
-	rm -rf $(DEB_TAR_DIR)
-	tar xzf $(TARFILE) --transform="s%$(distdir)%$(DEB_TAR_DIR)%"
-	rm -rf $(DEB_TAR_DIR)/debian
-	tar czf $@ $(DEB_TAR_DIR)
-
-$(DEB_SIG): $(DEB_TAR)
-	rm -f $@
-	gpg -a -b $(DEB_TAR)
+RELEASE_FILES = $(TARFILE) $(SIGFILE) $(SRPMFILE) $(RPMFILE)
 
 nickle.1: nickle.1.in nickle-config.h
 	sed -e 's,@''VERSION@,$(VERSION),' \
@@ -153,6 +125,9 @@ $(TARFILE): dist-gzip $(DISTFILES)
 	touch $(TARFILE)
 	echo $(TARFILE) ready
 
+compile:
+	echo 'no need to build compile'
+
 $(SIGFILE): $(TARFILE)
 	rm -f $@
 	gpg -a --detach-sign $(TARFILE)
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index da7773f..f001888 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -23,7 +23,9 @@ ADOCINC= \
 	advanced/concurrency.adoc \
 	advanced/continuations.adoc
 
-EXTRA_DIST=$(ADOCFILES) $(ADOCINC)
+IMAGES = nickle_obverse.jpg
+
+EXTRA_DIST=$(ADOCFILES) $(ADOCINC) $(IMAGES)
 
 if HASASCIIDOCTORPDF
 
commit 50ce070ea9fd0c4046e72964e22e2e92e1c32cfc
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Dec 19 19:01:15 2020 -0800

    Version 2.90
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index cf9b4f1..03e501f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ dnl for licensing information.
 
 AC_PREREQ([2.69])
 
-AC_INIT([nickle],[2.89],[http://nickle.org],[nickle])
-RELEASE_DATE="2020-12-15"
+AC_INIT([nickle],[2.90],[http://nickle.org],[nickle])
+RELEASE_DATE="2020-12-19"
 AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([nickle-config.h])
 AC_CONFIG_AUX_DIR(.)
diff --git a/debian/changelog b/debian/changelog
index 381209b..f0bfce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nickle (2.90) unstable; urgency=medium
+
+  * Fix a syntax error in sort.5c.
+
+ -- Keith Packard <keithp at keithp.com>  Sat, 19 Dec 2020 19:00:23 -0800
+
 nickle (2.89) unstable; urgency=medium
 
   * Fix a pile of lintian warnings.
commit ca6aa998463a17d1db93f436e124218b1c160090
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Dec 19 18:58:18 2020 -0800

    Header line fixes broken 'sort.5c'
    
    This one file had the 'Header' line as part of the initial comment
    instead of in a separate comment, removing it lost the leading /
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/sort.5c b/sort.5c
index a1bb799..56d3e5d 100644
--- a/sort.5c
+++ b/sort.5c
@@ -1,4 +1,4 @@
- *
+/*
  * Copyright © 2002 Keith Packard and Bart Massey.
  * All Rights Reserved.  See the file COPYING in this directory
  * for licensing information.