Update license for readshortcut to GPLv3+

diff --git a/AUTHORS b/AUTHORS
index 8f4bc49291a09416cad0a6e056ab584917e1834d..94e9413f67a0cdd70ea32a80dc4f9d5dcd7bc796 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,7 +24,7 @@ Joshua Danial Franklin  <joshuadfranklin@yahoo.com>
 
 Rob Siklos <rob3@siklos.ca>
   readshortcut.c, readshortcut.1
-  (GPLv2)
+  (GPLv3+)
 
 Michael Schaap  <cygwin_start@mscha.org>
   cygstart.c, cygstart.1

diff --git a/ChangeLog b/ChangeLog
index cca6fe02a1a679d3c01a4cb9f5f6de8efd29be70..1809f08cb6660113fec31c292a4400169d05fb49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
+2010-08-16  Charles Wilson  <cwilson@...>
+
+       Change license for readshortcut to GPLv3+
+       * src/readshortcut/readshortcut.c: Update license
+       to GPLv3+.
+       * AUTHORS: Update licensing info for readshortcut.
+       * NEWS: Ditto.
+       * PROGLIST: Ditto.
+       * README: Ditto.
+       * TODO: Ditto.
+
 2010-08-15  Charles Wilson  <cwilson@...>
 
+       Change license for lpr to GPLv3+.
        * src/lpr/lpr.cc: Update license to GPLv3+.
        * src/lpr/Printer.hh: Ditto.
        * src/lpr/Printer.cc: Ditto.

diff --git a/NEWS b/NEWS
index 3a1ab362d3d2d6f623599fa6916e038f90eb3945..6dc94cc70e73da7ea377571583005907e7ad6ae2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 1.4.6
   * Updated license for lpr to GPLv3+ (with permission from
     Rick Rankin)
+  * Updated license for readshortcut to GPLv3+ (with permission
+    from Rob Siklos)
 
 1.4.4
   * Fix longstanding bug in mkshortcut, in which failure was

diff --git a/PROGLIST b/PROGLIST
index d54a1bc6a588575f548b1791315f1c33aa740f23..d05f1dcca55bd87b7bb0e8f7fc97d670651820aa 100644 (file)
--- a/PROGLIST
+++ b/PROGLIST
@@ -77,7 +77,7 @@ mkshortcut.exe
 readshortcut.exe
   can be used to read information from windows shortcuts (such
   as target, icon, window state, etc)
-  (GPLv2)
+  (GPLv3+)
 
 cygstart.exe
   A command-line tool which allows you to let Windows start a program or open

diff --git a/README b/README
index 3b5a9062d3a2a299ccdf0b947bb04562b6e23d22..480ec06f679b05c2e521c94eeaa6090fae0fe428 100644 (file)
--- a/README
+++ b/README
@@ -51,13 +51,13 @@ GPLv3+:
  conv      unix2dos   dos2unix      d2u         u2d
  ipck      msgtool    semstat       semtool     shmtool
 
- lpr
+ lpr       readshortcut
 
 GPLv2+:
  cygstart  cygdrop    mkshortcut    cygicons.dll  realpath
 
 GPLv2:
- banner    readshortcut
+ banner
 
 PublicDomain-now-GPL:
  <none>

diff --git a/TODO b/TODO
index 9ed77f22900a48ef39e260b5065ed848afbac44e..bcabc7a28970171c31f694d961dcdb1399fa4513 100644 (file)
--- a/TODO
+++ b/TODO
@@ -16,7 +16,6 @@
 
 * GPLv3 conversion:
   - banner is GPLv2 only. Contact original author.
-  - readshortcut is GPLv2 only. Contact original author.
   - realpath is GPLv2+, but courtesy contact original author
   - cygstart is GPLv2+, but courtesy contact original author
   - cygdrop is GPLv2+, but courtesy contact original author

diff --git a/src/readshortcut/readshortcut.c b/src/readshortcut/readshortcut.c
index 45399f5e4e6e212a37df20d8cd9f68e7e40c5847..3cad30e2f09a10c21b45b08bed46457f897f8691 100644 (file)
--- a/src/readshortcut/readshortcut.c
+++ b/src/readshortcut/readshortcut.c
@@ -4,9 +4,10 @@
  * Copyright (C) 2003 Rob Siklos
  * http://www.cygwin.com/ml/cygwin/2003-08/msg00640.html
  *
- * 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 in version 2 of the License.
+ * 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
@@ -14,8 +15,9 @@
  * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See the COPYING file for full license information.
  */