* 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 <[email protected]>
---
 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  <[email protected]>
 
+       * 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 mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/findutils-patches

Reply via email to