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

diff --git a/config/srclist-update b/config/srclist-update
index 0ca420453..b528d1a40 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,17 +1,13 @@
 #!/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.
+# Copyright (C) 2002-2003, 2005, 2007-2011 Free Software Foundation, Inc.
 #
-# 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
@@ -19,11 +15,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 +30,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 +39,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.
@@ -123,6 +116,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