X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclist-update;h=9b3ddabc79d233db26ab1d6181288370298c7e46;hb=fbe6ced5d2fdadeeea4194725d05a52cf3b5ebd7;hp=b2619f1aed87e984d0790cebb7d798d00898d1e7;hpb=e2f08ee67d4c6f59a13a65089759e0070628ac97;p=gnulib.git
diff --git a/config/srclist-update b/config/srclist-update
index b2619f1ae..9b3ddabc7 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -4,12 +4,13 @@
# 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, 2007 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 +18,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 .
# Originally written by Karl Berry.
@@ -42,34 +42,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 .
/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 . */
'
# sed command to remove lines containing $Id lines.
@@ -121,6 +119,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