diff --git a/LOG b/LOG index 7b9a1ae62d..9855bef2a8 100644 --- a/LOG +++ b/LOG @@ -1243,3 +1243,5 @@ bintar/Makefile rpm/Makefile pkg/Makefile wininstall/Makefile wininstall/a6nt.wxs wininstall/i3nt.wxs wininstall/ta6nt.wxs wininstall/ti3nt.wxs +- fixed welcome text and copyright year in macOS package + newrelease pkg/Makefile release_notes.stex diff --git a/newrelease b/newrelease index a54b0a011f..35f1d00d38 100755 --- a/newrelease +++ b/newrelease @@ -156,7 +156,9 @@ sed -e "s/^version = .*/version = $R/" ../rpm/Makefile > rpm/Makefile set updatedfiles = ($updatedfiles rpm/Makefile) /bin/rm pkg/Makefile -sed -e "s/^version = .*/version = $R/" ../pkg/Makefile > pkg/Makefile +sed -e "s/^version = .*/version = $R/" \ + -e "s/© .* Cisco Systems/\© `date +%Y` Cisco Systems/" \ + ../pkg/Makefile > pkg/Makefile set updatedfiles = ($updatedfiles pkg/Makefile) mkdir wininstall diff --git a/pkg/Makefile b/pkg/Makefile index 33b77f7a65..4f5f1c54d3 100644 --- a/pkg/Makefile +++ b/pkg/Makefile @@ -75,10 +75,9 @@ $(BUILDROOT)/Distribution: $(BUILDROOT) chmod 644 $(BUILDROOT)/Distribution $(BUILDROOT)/Resources/en.lproj/Welcome.html: $(BUILDROOT)/Resources/en.lproj - echo 'cat << EOF > $(RESOURCES)/en.lproj/Welcome.html' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html - echo '' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html + echo '' > $(BUILDROOT)/Resources/en.lproj/Welcome.html echo '

Chez Scheme Version $(version)

' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html - echo '

Copyright (c) 2017 Cisco Systems, Inc.

' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html + echo '

Copyright © 2019 Cisco Systems, Inc.

' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html echo '

Chez Scheme is a programming language and an implementation of that language, with supporting tools and documentation.

' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html echo '' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html chmod 644 $(BUILDROOT)/Resources/en.lproj/Welcome.html diff --git a/release_notes/release_notes.stex b/release_notes/release_notes.stex index cbf849f6f2..0fab89a585 100644 --- a/release_notes/release_notes.stex +++ b/release_notes/release_notes.stex @@ -1663,6 +1663,11 @@ in fasl files does not generally make sense. %----------------------------------------------------------------------------- \section{Bug Fixes}\label{section:bugfixes} +\subsection{Welcome text in macOS package file (9.5.2)} + +The welcome text and copyright year in the macOS package file was +corrected. + \subsection{Fasl representation change for recursive ftypes (9.5.2)} A bug in the reading of mutually recursive ftype definitions from