[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Findutils-patches] [PATCH] Avoid false-positive of GPL_version check in
From: |
James Youngman |
Subject: |
[Findutils-patches] [PATCH] Avoid false-positive of GPL_version check in maint.mk. |
Date: |
Fri, 2 Apr 2010 01:48:19 +0100 |
* import-gnulib.sh (usage): Defeat the simple GPL version check
of maint.mk, since it's trying to identify GPL2 licenses. Since
the 'rehack' script converts v2 licenses into v3, we get a false
positive for v2. So, amusingly, we use the same hack that
maint.mk uses to avoid a false positive on itself: spurious
quotes.
Signed-off-by: James Youngman <address@hidden>
---
ChangeLog | 7 +++++++
import-gnulib.sh | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 310647a..466eb57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@
2010-04-02 James Youngman <address@hidden>
+ * import-gnulib.sh (usage): Defeat the simple GPL version check
+ of maint.mk, since it's trying to identify GPL2 licenses. Since
+ the 'rehack' script converts v2 licenses into v3, we get a false
+ positive for v2. So, amusingly, we use the same hack that
+ maint.mk uses to avoid a false positive on itself: spurious
+ quotes.
+
Switch from GNU Free Documentation License 1.2 to 1.3.
* NEWS: Update GFDL version.
* README-hacking: Likewise.
diff --git a/import-gnulib.sh b/import-gnulib.sh
index 1786a75..e1ae2f7 100755
--- a/import-gnulib.sh
+++ b/import-gnulib.sh
@@ -150,7 +150,7 @@ rehack() {
# Use cp to get the permissions right first
cp -fp "$1" "$1".new
sed -e \
-'s/Free Software Foundation\([;,]\) either version [2]/Free Software
Foundation\1 either version 3/' < "$1" > "$1".new
+'s/Free Software Foundation\([;,]\) either ''version [2]/Free Software
Foundation\1 either version 3/' < "$1" > "$1".new
if cmp "$1" "$1".new >/dev/null
then
echo "no change needed."
--
1.5.6.5
- [Findutils-patches] [PATCH] Update copyright years, James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Use the maintainer-makefile module., James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Update copyright years, James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Switch from GNU Free Documentation License 1.2 to 1.3., James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Regenerate doc/regexprops.texi, James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Avoid false-positive of GPL_version check in maint.mk.,
James Youngman <=
- [Findutils-patches] [PATCH] Remove useless if conditionals before calls to 'free'., James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Coding standard fix: "Warning" should be "WARNING" or "warning"., James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Quote the first argument of AC_DEFINE., James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Don't define S_IS*; include <sys/stat.h> instead., James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Various coding standard fixes., James Youngman, 2010/04/01
- [Findutils-patches] [PATCH] Add customisation of the behaviour of "make syntax-check"., James Youngman, 2010/04/01
- [Findutils-patches] Re: [PATCH] Don't define S_IS*; include <sys/stat.h> instead., James Youngman, 2010/04/03