From 555bd9ca6484b9ddc28311c57fc783eb5e84185c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 4 Jun 2021 22:13:43 +0200 Subject: [PATCH] git-merge-changelog: Fix license. * modules/git-merge-changelog (License): Change back to GPL. * lib/git-merge-changelog.c: Use a GPLv3+ notice. --- ChangeLog | 6 ++++++ lib/git-merge-changelog.c | 10 +++++----- modules/git-merge-changelog | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66a256a290..1bff09ddbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-06-04 Bruno Haible + + git-merge-changelog: Fix license. + * modules/git-merge-changelog (License): Change back to GPL. + * lib/git-merge-changelog.c: Use a GPLv3+ notice. + 2021-06-04 Bruno Haible Put GPLv3+ notices in source files where appropriate. diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index 0301f8fff5..f1697dea3b 100644 --- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -1,12 +1,12 @@ /* git-merge-changelog - git "merge" driver for GNU style ChangeLog files. Copyright (C) 2008-2021 Bruno Haible - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. diff --git a/modules/git-merge-changelog b/modules/git-merge-changelog index a88573cf59..c58ddc7bd9 100644 --- a/modules/git-merge-changelog +++ b/modules/git-merge-changelog @@ -35,7 +35,7 @@ git_merge_changelog_LDADD = libgnu.a @LIBINTL@ $(LIBTHREAD) Include: License: -GPLv2+ +GPL Maintainer: all -- 2.39.5