From bdb40e33c9767cdcd5e030c280f4bfaec46c8ae0 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sun, 5 Aug 2012 23:11:02 +1200 Subject: [PATCH] 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. --- Makefile.am | 2 +- SPONSORS => SPONSORS.list | 0 bootstrap.sh | 2 +- mkrelease.sh | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) rename SPONSORS => SPONSORS.list (100%) diff --git a/Makefile.am b/Makefile.am index 62c0a00f74..ca99109284 100644 --- 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 6405653070..4b008feb60 100755 --- 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.txt || (rm -f SPONSORS.txt && exit 1) +sed -e 's/@Squid-[0-9\.]*://' 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 9ddb8ee297..210265b806 100755 --- 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 ' -- 2.47.3