gnulib-tool: Stop doing license notice replacements.

* gnulib-tool: Don't document --more-symlinks and --more-hardlinks any
more.
(do_copyrights): Remove variable.
(func_import): Don't perform license updates on imported files any more.
* pygnulib/GLInfo.py: Don't document --more-symlinks any more.
* doc/gnulib-intro.texi (Copyright): Document the new situation.
* doc/gnulib.texi (Module description): Likewise.
* NEWS: Mention the change.

1 files changed, 2 insertions, 90 deletions

diff --git a/gnulib-tool b/gnulib-tool
index ad71f6e9e6..237693a883 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -332,10 +332,8 @@ Options for --import, --add/remove-import, --update,
 
 Options for --import, --add/remove-import, --update:
 
-  -S, --more-symlinks       Make symbolic links instead of copying files, and
-                            don't replace copyright notices.
-  -H, --more-hardlinks      Make hard links instead of copying files, and
-                            don't replace copyright notices.
+  -S, --more-symlinks       Deprecated; equivalent to --symlink.
+  -H, --more-hardlinks      Deprecated; equivalent to --hardlink.
 
 Report bugs to <bug-gnulib@gnu.org>."
 }
@@ -1128,8 +1126,6 @@ func_determine_path_separator
 # - lcopymode       symlink if --local-symlink was given,
 #                   hardlink if --local-hardlink was given,
 #                   blank otherwise
-# - do_copyrights   blank if --more-symlinks or --more-hardlinks was given,
-#                   true otherwise
 {
   mode=
   destdir=
@@ -1169,7 +1165,6 @@ func_determine_path_separator
   doit=:
   copymode=
   lcopymode=
-  do_copyrights=true
 
   supplied_opts="$@"
 
@@ -1458,11 +1453,9 @@ func_determine_path_separator
         shift ;;
       -S | --more-symlinks | --more-symlink | --more-symlin | --more-symli | --more-syml | --more-sym | --more-sy | --more-s )
         copymode=symlink
-        do_copyrights=
         shift ;;
       -H | --more-hardlinks | --more-hardlink | --more-hardlin | --more-hardli | --more-hardl | --more-hard | --more-har | --more-ha | --more-h )
         copymode=hardlink
-        do_copyrights=
         shift ;;
       --help | --hel | --he )
         func_usage
@@ -4692,8 +4685,6 @@ func_reconstruct_cached_local_gnulib_path ()
 # - doit            : if actions shall be executed, false if only to be printed
 # - copymode        copy mode for files in general
 # - lcopymode       copy mode for files from local_gnulib_path
-# - do_copyrights   true if copyright notices in files should be replaced,
-#                   blank otherwise
 func_import ()
 {
   # Get the cached settings.
@@ -5091,91 +5082,12 @@ s,^\(.................................................[^ ]*\) *,
     fi
   done
   sed_transform_main_lib_file="$sed_transform_lib_file"
-  if test -n "$do_copyrights"; then
-    if test -n "$lgpl"; then
-      # Update license.
-      case "$lgpl" in
-        yes | 3)
-          sed_transform_main_lib_file=$sed_transform_main_lib_file'
-            s/GNU General/GNU Lesser General/g
-            s/General Public License/Lesser General Public License/g
-            s/Lesser Lesser General Public License/Lesser General Public License/g
-          '
-          ;;
-        3orGPLv2)
-          sed_transform_main_lib_file=$sed_transform_main_lib_file'
-            /^ *This program is free software/i\
-   This program is free software: you can redistribute it and\/or\
-   modify it under the terms of either:\
-\
-     * the GNU Lesser General Public License as published by the Free\
-       Software Foundation; either version 3 of the License, or (at your\
-       option) any later version.\
-\
-   or\
-\
-     * 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.\
-\
-   or both in parallel, as here.
-            /^ *This program is free software/,/^$/d
-          '
-          ;;
-        2)
-          sed_transform_main_lib_file=$sed_transform_main_lib_file'
-            s/GNU General/GNU Lesser General/g
-            s/General Public License/Lesser General Public License/g
-            s/Lesser Lesser General Public License/Lesser General Public License/g
-
-            s/version [23]\([ ,]\)/version 2.1\1/g
-          '
-          ;;
-        *) func_fatal_error "invalid value lgpl=$lgpl" ;;
-      esac
-    else
-      # Update license.
-      sed_transform_main_lib_file=$sed_transform_main_lib_file'
-        s/GNU Lesser General/GNU General/g
-        s/Lesser General Public License/General Public License/g
-
-        s/GNU Library General/GNU General/g
-        s/Library General Public License/General Public License/g
-
-        s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
-      '
-    fi
-  fi
 
   # Determine script to apply to auxiliary files that go into $auxdir/.
   sed_transform_build_aux_file=
-  if test -n "$do_copyrights"; then
-    # Update license.
-    sed_transform_build_aux_file=$sed_transform_build_aux_file'
-      s/GNU Lesser General/GNU General/g
-      s/Lesser General Public License/General Public License/g
-
-      s/GNU Library General/GNU General/g
-      s/Library General Public License/General Public License/g
-
-      s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
-    '
-  fi
 
   # Determine script to apply to library files that go into $testsbase/.
   sed_transform_testsrelated_lib_file="$sed_transform_lib_file"
-  if test -n "$do_copyrights"; then
-    # Update license.
-    sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file'
-      s/GNU Lesser General/GNU General/g
-      s/Lesser General Public License/General Public License/g
-
-      s/GNU Library General/GNU General/g
-      s/Library General Public License/General Public License/g
-
-      s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
-    '
-  fi
 
   # Determine the final file lists.
   func_modules_to_filelist_separately