Release notes: use SPONSORS (no file type) as the published file name

SPONSORS.txt is the website published filename, but it seems some distros
were using the source code file name.

Use SPONSORS.ist for the coded listings instead.

diff --git a/Makefile.am b/Makefile.am
index 62c0a00f74fc9d9463f00b96df8dbce943e7a69f..ca9910928410800ecdb5788ba0158fbc4bc45068 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ EXTRA_DIST = \
        INSTALL \
        QUICKSTART \
        README \
-       SPONSORS.txt \
+       SPONSORS \
        bootstrap.sh \
        po4a.conf
 

diff --git a/SPONSORS b/SPONSORS.list
similarity index 100%
rename from SPONSORS
rename to SPONSORS.list

diff --git a/bootstrap.sh b/bootstrap.sh
index 64056530705c333dc280e08fee42d98813a3df36..4b008feb60d14a954e07379cd14fbed91c717dff 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -149,7 +149,7 @@ do
 done
 
 # Make a copy of SPONSORS we can package
-sed -e 's/@Squid-[0-9\.]*://' <SPONSORS > SPONSORS.txt || (rm -f SPONSORS.txt && exit 1)
+sed -e 's/@Squid-[0-9\.]*://' <SPONSORS.list > SPONSORS || (rm -f SPONSORS && exit 1)
 
 # Fixup autoconf recursion using --silent/--quiet option
 # autoconf should inherit this option whe recursing into subdirectories

diff --git a/mkrelease.sh b/mkrelease.sh
index 9ddb8ee29757c767bc427e3165c92822bf291940..210265b806b277bba782faff51059438897c5a2b 100755 (executable)
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -81,6 +81,7 @@ inst $tmpdir/CONTRIBUTORS     $dst/CONTRIBUTORS.txt
 inst $tmpdir/COPYING           $dst/COPYING.txt
 inst $tmpdir/COPYRIGHT         $dst/COPYRIGHT.txt
 inst $tmpdir/CREDITS           $dst/CREDITS.txt
+inst $tmpdir/SPONSORS          $dst/SPONSORS.txt
 inst $tmpdir/ChangeLog         $dst/ChangeLog.txt
 if [ -f $tmpdir/doc/release-notes/release-$RELEASE.html ]; then
     cat $tmpdir/doc/release-notes/release-$RELEASE.html | sed -e '