striconveh: Simplify last commit.

[gnulib.git] / config / srclist-update

diff --git a/config/srclist-update b/config/srclist-update
index 9366024..3b8b9d4 100755 (executable)
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,15 +1,14 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.18 2005-06-04 11:44:47 karl 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.
 #
-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2007, 2008, 2009, 2010 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
@@ -17,8 +16,7 @@
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Originally written by Karl Berry.
 
@@ -42,34 +40,32 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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/,/\*\//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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.
@@ -121,6 +117,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