Added the "...or (at your option) any later version" phrase to the license information of all plugins, and also the "newplugin" script

10 files changed, 46 insertions, 9 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5d078cfb..173d8a9a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1678,6 +1678,8 @@ Ville Skyttä <ville.skytta@iki.fi>
  for adapting cThread::ThreadId() to recent kernels
  for some improvements to the man pages
  for fixing some spelling errors in 'newplugin'
+ for suggesting to add the "...or (at your option) any later version" phrase to the
+ license information of all plugins, and also the 'newplugin' script
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index ee085bf0..a5fde6ec 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5335,3 +5335,6 @@ Video Disk Recorder Revision History
   one pointed to by Index (thanks to Alexander Rieger).
 - Fixed handling kLeft in the calls to cStatus::MsgOsdTextItem() (thanks to
   Alexander Rieger).
+- Added the "...or (at your option) any later version" phrase to the license
+  information of all plugins, and also the 'newplugin' script (suggested by
+  Ville Skyttä). Plugin authors may want to consider doing the same.
diff --git a/PLUGINS/src/hello/README b/PLUGINS/src/hello/README
index fd844ca6..5c5d3b0d 100644
--- a/PLUGINS/src/hello/README
+++ b/PLUGINS/src/hello/README
@@ -6,6 +6,10 @@ Project's homepage:          www.cadsoft.de/people/kls/vdr
 
 Latest version available at: www.cadsoft.de/people/kls/vdr/software.htm
 
-See the file COPYING for license information.
+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 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description: This is a small demo of the VDR plugin interface.
diff --git a/PLUGINS/src/osddemo/README b/PLUGINS/src/osddemo/README
index cc150aba..96f8912b 100644
--- a/PLUGINS/src/osddemo/README
+++ b/PLUGINS/src/osddemo/README
@@ -6,7 +6,11 @@ Project's homepage:          http://www.cadsoft.de/vdr
 
 Latest version available at: http://www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+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 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/PLUGINS/src/servicedemo/README b/PLUGINS/src/servicedemo/README
index 16dfbfb6..db7ad5b9 100644
--- a/PLUGINS/src/servicedemo/README
+++ b/PLUGINS/src/servicedemo/README
@@ -6,7 +6,11 @@ Project's homepage:          www.cadsoft.de/vdr
 
 Latest version available at: www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+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 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/PLUGINS/src/skincurses/README b/PLUGINS/src/skincurses/README
index ff82b0e7..b6ad9ec3 100644
--- a/PLUGINS/src/skincurses/README
+++ b/PLUGINS/src/skincurses/README
@@ -6,7 +6,11 @@ Project's homepage:          www.cadsoft.de/vdr
 
 Latest version available at: www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+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 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/PLUGINS/src/sky/README b/PLUGINS/src/sky/README
index 185a98b0..51b2d51d 100644
--- a/PLUGINS/src/sky/README
+++ b/PLUGINS/src/sky/README
@@ -6,7 +6,11 @@ Project's homepage:          www.cadsoft.de/vdr
 
 Latest version available at: www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+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 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/PLUGINS/src/status/README b/PLUGINS/src/status/README
index 356f1f8d..f7bcd2f4 100644
--- a/PLUGINS/src/status/README
+++ b/PLUGINS/src/status/README
@@ -6,6 +6,10 @@ Project's homepage:          www.cadsoft.de/people/kls/vdr
 
 Latest version available at: www.cadsoft.de/people/kls/vdr/software.htm
 
-See the file COPYING for license information.
+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 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description: This is an example that shows the use of cStatus.
diff --git a/PLUGINS/src/svdrpdemo/README b/PLUGINS/src/svdrpdemo/README
index 27b767a5..4ca6821d 100644
--- a/PLUGINS/src/svdrpdemo/README
+++ b/PLUGINS/src/svdrpdemo/README
@@ -6,7 +6,11 @@ Project's homepage:          http://www.cadsoft.de/vdr
 
 Latest version available at: http://www.cadsoft.de/vdr
 
-See the file COPYING for license information.
+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 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 
diff --git a/newplugin b/newplugin
index ff14982a..c35ae7e6 100755
--- a/newplugin
+++ b/newplugin
@@ -12,7 +12,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: newplugin 1.33 2007/08/10 15:54:46 kls Exp $
+# $Id: newplugin 1.34 2007/08/12 11:04:39 kls Exp $
 
 $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 
@@ -35,7 +35,11 @@ Project's homepage:          URL
 
 Latest version available at: URL
 
-See the file COPYING for license information.
+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 of the License, or
+(at your option) any later version.
+See the file COPYING for more information.
 
 Description:
 };