I did:
> * modules/git-merge-changelog (License): Change to GPLv2+.
That doesn't work: It produces gnulib-tool warnings
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: c-strstr
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: diffseq
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: fstrcmp
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: fwriteerror
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: rbtreehash-list
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: xalloc
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: xalloc-die
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: xlist
gnulib-tool: warning: module git-merge-changelog depends on a module with an
incompatible license: xmalloca
2021-06-04 Bruno Haible <br...@clisp.org>
git-merge-changelog: Fix license.
* modules/git-merge-changelog (License): Change back to GPL.
* lib/git-merge-changelog.c: Use a GPLv3+ notice.
diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 0301f8f..f1697de 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 <br...@clisp.org>
- 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 a88573c..c58ddc7 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
