Commits

Mats Lidell  committed a7bc376

Updated after "GPL version 3 source survey" walk thru.

  • Participants
  • Parent commits 02fe54c

Comments (0)

Files changed (3)

File matsl/gplv3/ChangeLog

+2010-11-13  Mats Lidell  <matsl@xemacs.org>>
+
+	* nonsense.py (nonsense): Added more files.
+	* substgplv2: (licensePatterns): Updated GPLv3 or later pattern to
+	handle another place for a line break.
+
 2010-11-02  Mats Lidell  <matsl@xemacs.org>
 
 	* substgplv2 (licensePatterns): Handle some more line breaks in

File matsl/gplv3/nonsense.py

-# This is a dictionary of files that does not easilly convertt from
+# This is a dictionary of files that is not easily converted from
 # GPLv2 or later to GPLv3 or later because they are not GPLv2 or
 # later. The reason we can live with that is given together with the
 # file name.
 
 # Explanation...
 GPLv3 = "GPLv3 or later -- But script can't identify it for some reason."
+GPLv2_NoMetaData = "GPLv2 or later but there is not meta data for the file where this can be documented."
 LISPREF_TEXI = "see lispref.texi for copyright, not version 2 or later!?"
 MIT_NOA = 'MIT-style "no advertising" license'
+MIT = "MIT"
 NL = "No license"
 NOEXP = "Emacs version has no explicit license declaration"
 OFSF = "old FSF Documentation license"
+TO_SHORT = "Too short. (< 10 lines)"
 
 nonsense = { 
-    "CHANGES-beta" : "No copyright",
     "INSTALL" : OFSF,
-    "PROBLEMS": "No copyright",
     "aclocal.m4" : GPLv3,
     "config.guess" : "Part of config which is still GPLv2 or later. See \"http://savannah.gnu.org/projects/config\"",
     "config.sub" : "Part of config which is still GPLv2 or later. See \"http://savannah.gnu.org/projects/config\"",
     "etc/VEGETABLES"  : "Not copyrightable.",
     "etc/ctags.1"  : "Part of the etags distribution, which is not part of XEmacs.",
     "etc/etags.1" : "Part of the etags distribution, which is not part of XEmacs.",
-    "etc/sample.Xdefaults" : "I think we can remove this one now, even if people use .Xdefaults personally it's been 10 years or more since it was deprecated by the X11 developers.",
+    "etc/sample.Xdefaults" : "It is deprecated, so it can be removed but is only a three line reference to .Xresources",
+    "etc/gnuattach.1" : "simple man link to gnuserv.1",
+    "etc/gnuclient.1" : "simple man link to gnuserv.1",
+    "etc/gnudoit.1" : "simple man link to gnuserv.1",
+    "etc/refcard.ps.gz" : "Generated from refcard..tex",
+    "etc/XKeysymDB" : MIT,
+    "etc/ETAGS.ChangeLog" : "BSD and GPL v2 or later",
+    "etc/custom/example-themes/ex-custom-file" : "Generated(!?) or GPL V2 or later?",
+    "etc/xemacs-X.ico" : GPLv2_NoMetaData,
     "install-sh" : MIT_NOA,
+    "info/dir" : "Generated(?)",
     "lib-src/b2m.c" : "This is the version from GNU Emacs, so should be OK.",
     "lib-src/config.values.in" : "Generated.",
     "lib-src/emacs.csh" : "I don't think this even works with XEmacs (\"emacsclient\"), so I believe we can just delete it.",
     "lib-src/insert-data-in-exec.c" : "Compatible license.",
     "lib-src/mmencode.c" : "Compatible license.",
+    "modules/canna/install-sh" : MIT,
+    "modules/ldap/install-sh" : MIT,
+    "modules/postgresql/install-sh" : MIT,
+    "modules/sample/external/install-sh" : MIT,
+    "modules/sample/internal/install-sh" : MIT,
+    "nt/Xmd.patch" : "GPLv2 or later but only a few lines",
+    "nt/file.ico" : MIT,
+    "nt/paths.h" : "Generated",
+    "nt/minitar.c" : "Public domain",
+    "nt/xemacs.ico" : GPLv2_NoMetaData,
     "lisp/term/vt102.el" : NOEXP,
     "lisp/term/vt125.el" : NOEXP,
     "lisp/term/vt200.el" : NOEXP,
     "lisp/term/vt320.el" : NOEXP,
     "lisp/term/vt400.el" : NOEXP,
     "lisp/term/vt420.el" : NOEXP,
+    "lisp/term/bobcat.el" : NOEXP,
+    "lisp/dump-paths.el" : "Empty file. Not copyrightable.",
     "lock/.precious"  : "Not copyrightable.",
     "move-if-change" : "Identical to GPLv3 or later Emacs version",
     "src/alloca.c" : "Public domain.",
     "src/libsst.c" : "Compatible license.",
     "src/libsst.h" : "Compatible license.",
     "src/libst.h" : "Compatible copyright.",
-    "src/linuxplay.c" : "Compatible copyright.",
-    "src/miscplay.c" : "Copyright is compatible with GPLv3.",
-    "src/miscplay.h" : "Compatible copyright.",
-    "src/nas.c" : "Compatible license.",
+    "src/linuxplay.c" : "Compatible license. (MIT-like)",
+    "src/miscplay.c" : "Compatible license. (MIT-like)",
+    "src/miscplay.h" : "Compatible license. (MIT-like)",
+    "src/nas.c" : "Compatible license. (MIT-like)",
     "src/paths.h.in" : "Generated.",
-    "src/s/openbsd.h"  : "Too short to need copyrighting. (< 10 lines)",
-    "src/s/usg5-4-2.h" : "Too short to need copyrighting. (< 10 lines)",
+    "src/s/openbsd.h"  : TO_SHORT,
+    "src/s/usg5-4-2.h" : TO_SHORT,
     "src/sunplay.c" : "Compatible copyright.",
-    "tests/tooltalk/beeps.el" : "Too short to need copyrighting. (< 10 lines)",
+    "src/depend" : "Generated",
+    "tests/tooltalk/beeps.el" : TO_SHORT,
+    "tests/gtk/UNIMPLEMENTED" : "Does notes need a license?"
 } 

File matsl/gplv3/substgplv2

 # Pattern zero...
 # Already converted?
 [
-"Free Software Foundation, either version 3 of the License, or(\s|#|;|\*)+\(at your(\s|#|;|\*)+option\) any later version.",
+"Free Software Foundation, either version 3 of(\s|#|;|%|\*)+the License, or(\s|#|;|%|\*)+\(at your(\s|#|;|%|\*)+option\) any later version.",
 "gplv3",
 None,
 ],