X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclist-update;h=198856a4052173e747f7d4022f26b90112cad6fb;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=0ca4204534f05ea4174d81acf4b3f2109eb1bedf;hpb=1fea47043952c3c97e5c66a080a3f1aa7fadb68c;p=gnulib.git

diff --git a/config/srclist-update b/config/srclist-update
index 0ca420453..198856a40 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,17 +1,27 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.14 2003-08-15 18:04:34 eggert Exp $
-#
 # Check for files in directory $1 being up to date, according to the
 # list on stdin.  Don't actually make any changes, just show the diffs.
 #
-# Source `dirname $0`/srclistvars.sh first, if it exists.
-
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Empty (or only whitespace) input lines are ignored.
+# Lines beginning with # are ignored.
+# Lines with just one word are ignored.
+# Otherwise, the line has two or more whitespace-separated words:
+#   the first word is the source, the second word is the destination,
+#   other optional words are options.
+# The possible options are "gpl" (to replace the license with the GPL)
+#   and "doclicense" (to replace @include doclicense.texi with fdl.texi).
+#   Unrecognized options are ignored.
+# $VARIABLE expansions are done (with sh eval).
+#
+# This script is used in gnulib and texinfo; the input files are named
+# srclist.txt.
 #
-# This program is free software; you can redistribute it and/or modify
+# Copyright (C) 2002-2003, 2005, 2007-2014 Free Software Foundation, Inc.
+#
+# 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, or (at your option)
-# any later version.
+# 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,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,11 +29,9 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Written by Karl Berry.
+# Originally written by Karl Berry.
 
 
 if test -n "$1"; then
@@ -36,6 +44,7 @@ verbose=false
 : ${TMPDIR=/tmp}
 dsttmp=$TMPDIR/srclist.dst
 
+# Source `dirname $0`/srclistvars.sh first, if it exists.
 mydir=`dirname $0`
 test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh
 
@@ -44,38 +53,36 @@ test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh
 # sed command to fix the license to be GPL.
 fixlicense='
   /^[[:space:]]*#[[:space:]]*Th[ei][ s].* is free software/,/^[[:space:]]*#.*USA\./c\
-#   This program is free software; you can redistribute it and/or modify\
+#   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, or (at your option)\
-#   any later version.\
+#   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,\
 #   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.\
 #\
-#   You should have received a copy of the GNU General Public License along\
-#   with this program; if not, write to the Free Software Foundation,\
-#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#   You should have received a copy of the GNU General Public License\
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  /Th[ei][ s].* is free software/,/USA\.  *\*\//c\
-   This program is free software; you can redistribute it and/or modify\
+  /Th[ei][ s].* is free software/,/\*\//c\
+   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, or (at your option)\
-   any later version.\
+   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,\
    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.\
 \
-   You should have received a copy of the GNU General Public License along\
-   with this program; if not, write to the Free Software Foundation,\
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License\
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 '
 
 # sed command to remove lines containing $Id lines.
-# Quote the $Id so that CVS does not expand it in this script.
+# Quote the $ so that CVS does not expand it in this script.
 remove_id_lines='/[$]Id:.*[$]/d'
 
 # $1 is input file, $2 is output.
@@ -90,6 +97,9 @@ fixfile() \
   case " $options " in
   *' gpl '*)
     sed_command="$sed_command; $fixlicense";;
+
+  *' doclicense '*)
+    sed_command="$sed_command; s/@include doclicense.texi/@include fdl.texi/";;
   esac
 
   sed "$sed_command" $1 >$2
@@ -123,6 +133,9 @@ cat | while read src dst options; do
   fixfile $src $srctmp
   test -r $dst && fixfile $dst $dsttmp
 
+  # if src was executable, make dst executable, to placate git.
+  test -x $src && chmod a+x $dst
+
   if test ! -e $dst; then
     echo "## $srctmp $dst  # new"
     $chicken cp -p $srctmp $dst