[llvm-commits] [llvm-gcc-4.2] r76173 - /llvm-gcc-4.2/trunk/fixincludes/fixincl.x

[Duncan Sands]

Author: baldrick
Date: Fri Jul 17 06:42:20 2009
New Revision: 76173

URL: http://llvm.org/viewvc/llvm-project?rev=76173&view=rev
Log:
The latest version of autogen outputs the GPLv3
when it sees the gpl command (run on line 23 of
fixincl.tpl), unlike previous versions that output
the GPLv2+.  Since the fixincludes directory is
under the GPLv2+, correct the licence by hand
back to this.  Note that the licence has nothing
to do with how autogen itself is licenced.

Modified:
    llvm-gcc-4.2/trunk/fixincludes/fixincl.x

Modified: llvm-gcc-4.2/trunk/fixincludes/fixincl.x
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/fixincludes/fixincl.x?rev=76173&r1=76172&r2=76173&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/fixincludes/fixincl.x (original)
+++ llvm-gcc-4.2/trunk/fixincludes/fixincl.x Fri Jul 17 06:42:20 2009
@@ -22,18 +22,22 @@
  *  inclhack copyright (c) 1998, 1999, 2000, 2001
  *  The Free Software Foundation, Inc.
  *
-  *  inclhack 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 3 of the License, or
- *  (at your option) any later version.
+  *  inclhack is free software.
  *  
- *  inclhack is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  You may 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.
+ *  
+ *  inclhack 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, see <http://www.gnu.org/licenses/>.
+ *  You should have received a copy of the GNU General Public License
+ *  along with inclhack.  See the file "COPYING".  If not,
+ *  write to:  The Free Software Foundation, Inc.,
+ *             59 Temple Place - Suite 330,
+ *             Boston,  MA  02111-1307, USA.
  */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *