From 486208e0ea971328ea4c1229acb70e20eeb06bb8 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Thu, 29 Sep 2022 15:32:38 -0600 Subject: [PATCH] core 12.2.0 --- debian/changelog | 6 ++++++ doc/configure.ac | 2 +- doc/mit-scheme-pucked.1 | 2 +- doc/user-manual/user.texinfo | 2 +- src/configure.ac | 2 +- src/microcode/configure.ac | 2 +- src/runtime/version.scm | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 62a5a5e90..e40df4db5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mit-scheme-pucked (12.2.0) birchwood; urgency=low + + * Merge with master. Use the released version plus 1. + + -- Matt Birkholz Sun, 18 Sep 2022 00:00:00 -0000 + mit-scheme-pucked (12.0.20) birchwood; urgency=low * Merge with master. Use master's version plus 20. diff --git a/doc/configure.ac b/doc/configure.ac index 4e6f32d9a..38f5e632a 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([MIT/GNU Scheme Pucked documentation], - [12.0.20], + [12.2.0], [matt@birchwood-abbey.net], [mit-scheme-pucked-doc]) AC_CONFIG_SRCDIR([ref-manual/scheme.texinfo]) diff --git a/doc/mit-scheme-pucked.1 b/doc/mit-scheme-pucked.1 index c1698f433..3c0a3b7dc 100644 --- a/doc/mit-scheme-pucked.1 +++ b/doc/mit-scheme-pucked.1 @@ -1,4 +1,4 @@ -.TH "mit-scheme-pucked" "1" "12.0.20" "Friar Puck and The MIT/GNU Scheme Team" "" +.TH "mit-scheme-pucked" "1" "12.2.0" "Friar Puck and The MIT/GNU Scheme Team" "" .SH "NAME" .LP mit-scheme-pucked - Friar Puck's MIT/GNU Scheme development environment diff --git a/doc/user-manual/user.texinfo b/doc/user-manual/user.texinfo index d24482efd..f85282e3a 100644 --- a/doc/user-manual/user.texinfo +++ b/doc/user-manual/user.texinfo @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @comment %**start of header @setfilename user -@set VERSION 12.0.20 +@set VERSION 12.2.0 @set UPDATED 12 June 2020 @settitle MIT/GNU Scheme Pucked @value{VERSION} User Manual @comment %**end of header diff --git a/src/configure.ac b/src/configure.ac index c89554c95..1bea3d195 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([MIT/GNU Scheme Pucked], - [12.0.20], + [12.2.0], [matt@birchwood-abbey.net], [mit-scheme-pucked]) AC_CONFIG_SRCDIR([microcode/boot.c]) diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac index 4f97b54d3..4cc88799a 100644 --- a/src/microcode/configure.ac +++ b/src/microcode/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([MIT/GNU Scheme Pucked microcode], - [12.0.20], + [12.2.0], [matt@birchwood-abbey.net], [mit-scheme-pucked]) AC_CONFIG_SRCDIR([boot.c]) diff --git a/src/runtime/version.scm b/src/runtime/version.scm index bcfaf6925..4d22637a9 100644 --- a/src/runtime/version.scm +++ b/src/runtime/version.scm @@ -43,7 +43,7 @@ USA. (add-boot-init! (lambda () - (add-subsystem-identification! "Release" '(12 0 20)) + (add-subsystem-identification! "Release" '(12 2 0)) (run-now-and-after-restore! (lambda () (add-subsystem-identification! "Microcode" (get-microcode-version)))) -- 2.47.3