Change license for cygicons.dll to GPLv3+

diff --git a/AUTHORS b/AUTHORS
index 24625f57732444ed68883b2a4f032e3288fa4cc0..91e46f91f7fac2b8692138fd397351a05fa832ff 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,9 +40,9 @@ Christian Franke <franke@computer.org>
 
 unknown, Charles Wilson, Nicky H., August Mayer
 August Mayer, FBL
-  individual icons within the cygicons dll
-  See src/cygicons/README-cygicons
-  (GPL)
+  Individual icons within the cygicons dll:
+    wee src/cygicons/README-cygicons (GPL, public domain, CC-BY-SA)
+  Collection: GPLv3+
 
 No longer included:
 ===================

diff --git a/ChangeLog b/ChangeLog
index e14d59bd426e83a6ad275b9248160ec4134fb3c4..466b6db82ae8416ced86ba556adb40c7832461c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-18  Charles Wilson  <cwilson@...>
+
+       Change license for cygicons.dll to GPLv3+
+       * src/cygicons/cygicons.rc.in: Update license to GPLv3+.
+       * AUTHORS: Update licensing info for cygicons.dll.
+       * NEWS: Ditto.
+       * PROGLIST: Ditto.
+       * README: Ditto.
+       * TODO: Ditto.
+
 2010-08-18  Charles Wilson  <cwilson@...>
 
        Change license for mkshortcut to GPLv3+

diff --git a/NEWS b/NEWS
index d3cf1adee34ee750f48b5f507f69ae41cc5d0790..a1b03ab3b900c6878a8d8223d35ab60b896decfe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,9 @@
     from Christian Franke)
   * Updated license for mkshortcut to GPLv3+ (was GPLv2+; no objections
     from Joshua Daniel Franklin)
+  * Updated license for the cygicons.dll (as a collection) to GPLv3+ (was
+    GPLv2+). Individual icons within the collection remain under their
+    original license.
 
 1.4.4
   * Fix longstanding bug in mkshortcut, in which failure was

diff --git a/PROGLIST b/PROGLIST
index 6ab02c6bbb983900c698a5d8d89904f4f91b1f29..cc0913d21c46792886341d7a58c5a1bf772b38d3 100644 (file)
--- a/PROGLIST
+++ b/PROGLIST
@@ -101,7 +101,7 @@ ipck:
 
 cygicons:
   DLL containing cygwin-related icons
-  (GPLv2+)
+  (GPLv3+)
 
 (*) originally BSD+advert, but falls under the blanket 
     conversion to BSD-no-advert, because it was originally

diff --git a/README b/README
index 9d0bde292bef115e48cc470ecaa628e6ac4dc83c..abcc60875f0052bb936e3af315236efbc8b83620 100644 (file)
--- a/README
+++ b/README
@@ -51,11 +51,8 @@ GPLv3+:
  conv      unix2dos   dos2unix      d2u         u2d
  ipck      msgtool    semstat       semtool     shmtool
 
- cygdrop   cygstart   lpr           mkshortcut  readshortcut
- realpath
-
-GPLv2+:
- cygicons.dll
+ cygdrop       cygicons.dll   cygstart   lpr   mkshortcut
+ readshortcut  realpath
 
 GPLv2:
  banner

diff --git a/TODO b/TODO
index 4dee99cea6acc8d4142d7219c0ec86b0ed2d8da8..5373282d5733f512cedbaab1e459d3be5724ead4 100644 (file)
--- a/TODO
+++ b/TODO
@@ -16,5 +16,3 @@
 
 * GPLv3 conversion:
   - banner is GPLv2 only. Contact original author.
-  - cygicons.dll compilation is GPLv2+, but includes artwork that
-    is unspecified GPL. Need to research whether this can be upgraded.

diff --git a/src/cygicons/cygicons.rc.in b/src/cygicons/cygicons.rc.in
index a7b9d1d2925f6f13ad2c2f1c705f57907032fd29..e97624beb0b5da5f4a50128ffd5e1be0b880807c 100644 (file)
--- a/src/cygicons/cygicons.rc.in
+++ b/src/cygicons/cygicons.rc.in
@@ -1,13 +1,13 @@
 /**
  * cygicons.rc : resource description for cygwin-related icons
  *
- * Copyright 2007,2009 by Charles S. Wilson <cygwin@cygwin.com>
+ * Copyright 2007,2009,2010 by Charles S. Wilson <cygwin@cygwin.com>
  * All rights reserved.
  *
- * 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.
+ * 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 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
@@ -15,10 +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 license information.
+ * See the COPYING file for full license information.
  */
 
 #if HAVE_CONFIG_H
@@ -50,17 +49,18 @@ IDI_CYGWIN_HIPPO  ICON "hippo.ico"
 #define VER_COMPANYNAME_STR       "Charles S. Wilson @PACKAGE_BUGREPORT@\0"
 #define VER_FILEDESCRIPTION_STR   "Provides cygwin-related icons.\0"
 #define VER_INTERNALNAME_STR      "cygicons-@CYGICONS_DLL_VERSION@\0"
-#define VER_LEGALCOPYRIGHT_STR    "Copyright © 2007,2009 Charles S. Wilson\0"
+#define VER_LEGALCOPYRIGHT_STR    "Copyright © 2007,2009,2010 Charles S. Wilson\0"
 #define VER_ORIGINALFILENAME_STR  "cygicons-@CYGICONS_DLL_VERSION@.dll\0"
 #define VER_PRODUCTNAME_STR       "@PACKAGE_NAME@\0"
-#define VER_GNU_COPYLEFT_STR      "Released under the GNU General Public License version 2 \
+#define VER_GNU_COPYLEFT_STR      "Released under the GNU General Public License version 3 (or later) \
 -------------------------------- \
-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. \
+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 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. \
+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\0"
-
+You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>. \
+-------------------------------- \
+See the COPYING file for full license information.\0"
 
 #ifndef DEBUG
 #define VER_DEBUG               0