diff --git a/.github/labeler.yml b/.github/labeler.yml index 43d42808f335..db742f7168a5 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -92,7 +92,7 @@ documentation: - all: - changed-files: - any-glob-to-all-files: - - '{.github/workflows/badwords.yml,.github/workflows/man-examples.yml,.github/workflows/synopsis.yml,.github/scripts/badwords.*,.github/scripts/cd2cd,.github/scripts/cd2nroff,.github/scripts/cdall.pl,.github/scripts/nroff2cd,.github/scripts/verify-examples.pl,.github/scripts/verify-synopsis.pl,**/*.md,**/*.txt,**/*.1,CHANGES,docs/**,LICENSES/**,README,RELEASE-NOTES,scripts/cd*}' + - '{.github/workflows/badwords.yml,.github/workflows/man-examples.yml,.github/workflows/synopsis.yml,.github/scripts/badwords.*,.github/scripts/cd2cd,.github/scripts/cd2nroff,.github/scripts/cdall.pl,.github/scripts/nroff2cd,.github/scripts/verify-examples.pl,.github/scripts/verify-synopsis.pl,**/*.md,**/*.txt,**/*.1,CHANGES.md,docs/**,LICENSES/**,README,RELEASE-NOTES,scripts/cd*}' - all-globs-to-all-files: # negative matches - '!**/CMakeLists.txt' diff --git a/.gitignore b/.gitignore index 6d1e69ed04b5..a9099e5ce42b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,6 @@ /builds/ /stats/ __pycache__ -CHANGES.dist Debug INSTALL Makefile diff --git a/CHANGES b/CHANGES deleted file mode 100644 index 3e2cd9947dc9..000000000000 --- a/CHANGES +++ /dev/null @@ -1,7 +0,0 @@ -See https://curl.se/changes.html for the edited and human readable online -version of what has changed over the years in different curl releases. - -Generate a CHANGES file like the one present in every release like this: - -$ git log --pretty=fuller --no-color --date=short --decorate=full | \ - ./scripts/log2changes.pl diff --git a/CHANGES.md b/CHANGES.md new file mode 100644 index 000000000000..6e2f7c6bcc4b --- /dev/null +++ b/CHANGES.md @@ -0,0 +1,12 @@ + + +In a release tarball, check the RELEASES-NOTES file for what was done in the +most recent release. In a git check-out, that file mentions changes that have +been done since the previous release. + +See the online [changelog](https://curl.se/changes.html) for the edited and +human readable version of what has changed in different curl releases. diff --git a/Makefile.am b/Makefile.am index ffd319457c00..62b35a535403 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,7 +75,7 @@ PLAN9_DIST = plan9/include/mkfile \ plan9/src/mkfile.inc \ plan9/src/mkfile -EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ +EXTRA_DIST = CHANGES.md COPYING maketgz Makefile.dist curl-config.in \ RELEASE-NOTES buildconf libcurl.pc.in $(CMAKE_DIST) $(VC_DIST) \ $(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat \ libcurl.def Dockerfile diff --git a/REUSE.toml b/REUSE.toml index c973868b439e..93c50dd71fe3 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -14,7 +14,6 @@ SPDX-PackageDownloadLocation = "https://curl.se/" [[annotations]] path = [ ".mailmap", - "CHANGES", "docs/FAQ", "docs/INSTALL", "docs/KNOWN_BUGS", diff --git a/maketgz b/maketgz index 0492371a9fbc..18749448cf70 100755 --- a/maketgz +++ b/maketgz @@ -146,9 +146,6 @@ else automake --include-deps Makefile >/dev/null fi -echo "produce CHANGES" -git log --pretty=fuller --no-color --date=short --decorate=full -1000 | ./scripts/log2changes.pl > CHANGES.dist - echo "produce RELEASE-TOOLS.md" ./scripts/release-tools.sh "$timestamp" "$version" > docs/RELEASE-TOOLS.md.dist diff --git a/packages/OS400/makefile.sh b/packages/OS400/makefile.sh index fb1f1467132c..7f7584521589 100755 --- a/packages/OS400/makefile.sh +++ b/packages/OS400/makefile.sh @@ -65,7 +65,7 @@ fi # Copy some documentation files if needed. for TEXT in "${TOPDIR}/COPYING" "${SCRIPTDIR}/README.OS400" \ - "${TOPDIR}/CHANGES" "${TOPDIR}/docs/THANKS" "${TOPDIR}/docs/FAQ" \ + "${TOPDIR}/CHANGES.md" "${TOPDIR}/docs/THANKS" "${TOPDIR}/docs/FAQ" \ "${TOPDIR}/docs/FEATURES" "${TOPDIR}/docs/SSLCERTS.md" \ "${TOPDIR}/docs/RESOURCES" "${TOPDIR}/docs/VERSIONS.md" \ "${TOPDIR}/docs/HISTORY.md" diff --git a/scripts/log2changes.pl b/scripts/log2changes.pl deleted file mode 100755 index 355418368563..000000000000 --- a/scripts/log2changes.pl +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env perl -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at https://curl.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -# SPDX-License-Identifier: curl -# -########################################################################### - -# git log --pretty=fuller --no-color --date=short --decorate=full - -my @mname = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', - 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ); - -sub nicedate { - my ($date)=$_; - - if($date =~ /(\d\d\d\d)-(\d\d)-(\d\d)/) { - return sprintf("%d %s %4d", $3, $mname[$2-1], $1); - } - return $date; -} - -sub printmsg { - my ($p, $msg)=@_; - while(length($msg) > 77) { - print $p.substr($msg, 0, 77, "")."\n"; - $p=" "; - } - if($msg eq "") { - $p = ""; - } - print "$p$msg\n"; -} - -print -' _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ - \___|\___/|_| \_\_____| - - Changelog -'; - -my $tag; -while() { - my $l = $_; - - if($l =~/^commit ([[:xdigit:]]*) ?(.*)/) { - $co = $1; - my $ref = $2; - if ($ref =~ /refs\/tags\/curl-([0-9_]*)/) { - $tag = $1; - $tag =~ tr/_/./; - } - } - elsif($l =~ /^Author: *(.*) +