Re: [Bug-gnulib] no new tabs please (was: normalize leading and remove trailing white space from imported files)

[Paul Eggert]

srclist-update should preserve the leading prefix of the input, though
that's a pain in sed.  As it happens, though, all the scripts
currently use '#' followed by 3 spaces so the following change is good
enough for now.  I installed it.

Perhaps you could switch the gettext copies to be GPL'ed?  The shell
scripts themselves aren't going to be linked into the library, so they
don't need to be distributed under the LGPL per se.  If you switched
them to the GPL then srclist-update wouldn't need to hack on them, and
we wouldn't need the multiple differing copies.

Index: config/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/ChangeLog,v
retrieving revision 1.39
diff -p -u -r1.39 ChangeLog
--- config/ChangeLog    13 Aug 2003 20:23:14 -0000      1.39
+++ config/ChangeLog    15 Aug 2003 18:01:59 -0000
@@ -1,3 +1,9 @@
+2003-08-15  Paul Eggert  <address@hidden>
+
+       * srclist-update: Use three spaces, rather than tab, after '#'
+       in shell-script copyright notices.  Suggested by Bruno Haible.
+       Remove unnecessary parenthesization in regular expression.
+       
 2003-08-13  Paul Eggert  <address@hidden>
 
        * srclist-update: Change update back to the old behavior, leaving
Index: config/srclist-update
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist-update,v
retrieving revision 1.13
diff -p -u -r1.13 srclist-update
--- config/srclist-update       13 Aug 2003 20:23:14 -0000      1.13
+++ config/srclist-update       15 Aug 2003 18:01:59 -0000
@@ -43,20 +43,20 @@ test -r $mydir/srclistvars.sh && . $mydi
 # 
 # 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\
-#      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.\
+  /^[[:space:]]*#[[:space:]]*Th[ei][ s].* is free 
software/,/^[[:space:]]*#.*USA\./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.\
 #\
-#      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.\
+#   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, write to the Free Software Foundation,\
+#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
   /Th[ei][ s].* is free software/,/USA\.  *\*\//c\
    This program is free software; you can redistribute it and/or modify\
Index: lib/ChangeLog
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/ChangeLog,v
retrieving revision 1.532
diff -p -u -r1.532 ChangeLog
--- lib/ChangeLog       14 Aug 2003 23:38:10 -0000      1.532
+++ lib/ChangeLog       15 Aug 2003 18:02:01 -0000
@@ -1,3 +1,9 @@
+2003-08-15  Paul Eggert  <address@hidden>
+
+       * config.charset, ref-add.sin, ref-del.sin: Use three spaces,
+       rather than tab, after '#' in shell-script copyright notices.
+       Suggested by Bruno Haible.
+
 2003-08-14  Jim Meyering  <address@hidden>
 
        * mountlist.c: Remove anachronistic casts of xmalloc, xrealloc,
Index: lib/config.charset
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/config.charset,v
retrieving revision 1.17
diff -p -u -r1.17 config.charset
--- lib/config.charset  13 Aug 2003 20:23:14 -0000      1.17
+++ lib/config.charset  15 Aug 2003 18:02:01 -0000
@@ -3,19 +3,19 @@
 #
 #   Copyright (C) 2000-2003 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.
+#   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.
 #
-#      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.
+#   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, write to the Free Software Foundation,
+#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # The table consists of lines of the form
 #    ALIAS  CANONICAL
Index: lib/ref-add.sin
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/ref-add.sin,v
retrieving revision 1.3
diff -p -u -r1.3 ref-add.sin
--- lib/ref-add.sin     13 Aug 2003 06:48:59 -0000      1.3
+++ lib/ref-add.sin     15 Aug 2003 18:02:01 -0000
@@ -2,19 +2,19 @@
 #
 #   Copyright (C) 2000 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.
+#   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.
 #
-#      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.
+#   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, write to the Free Software Foundation,
+#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # Written by Bruno Haible <address@hidden>.
 #
Index: lib/ref-del.sin
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/ref-del.sin,v
retrieving revision 1.3
diff -p -u -r1.3 ref-del.sin
--- lib/ref-del.sin     13 Aug 2003 06:48:59 -0000      1.3
+++ lib/ref-del.sin     15 Aug 2003 18:02:01 -0000
@@ -2,19 +2,19 @@
 #
 #   Copyright (C) 2000 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.
+#   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.
 #
-#      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.
+#   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, write to the Free Software Foundation,
+#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # Written by Bruno Haible <address@hidden>.
 #