Merge branch 'unlicense'

* Branch commit log: misc/mkcopyright.py: match Unlicense dedications misc/mkcopyright.py: dedicated to the Public Domain under the Unlicense doc/copyright.ini: use Unlicense for Public Domain dedication jsonipc/testjsonipc.cc: use Unlicense for Public Domain dedication jsonipc/jsonipc.js: use Unlicense for Public Domain dedication ase/mime-types.hh: use Unlicense for Public Domain dedication Signed-off-by: Tim Janik <[email protected]>
tim-janik · Jun 27, 2024 · 11bfbe7 · 11bfbe7
2 parents 5993a34 + f48b6eb
commit 11bfbe7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/ase/mime-types.hh b/ase/mime-types.hh
@@ -1,4 +1,4 @@
-// Licensed CC0 Public Domain
+// Dedicated to the Public Domain under the Unlicense: https://unlicense.org/UNLICENSE
 
 // Source: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types
 static const char mime_types[] = R""""(

diff --git a/doc/copyright.ini b/doc/copyright.ini
@@ -1,5 +1,5 @@
 # Anklang project config file for mkcopyright.py
-# Licensed CC0 Public Domain: http://creativecommons.org/publicdomain/zero/1.0
+# Dedicated to the Public Domain under the Unlicense: https://unlicense.org/UNLICENSE
 
 [debian/copyright]
 Upstream-Name:		anklang
@@ -11,7 +11,7 @@ Disclaimer:		Autogenerated by anklang/misc/mkcopyright.py
 files =
       LICENSE
 
-[CC0-1.0]
+[Unlicense]
 patterns =
 	 (.*/)?GNUmakefile
 

diff --git a/jsonipc/jsonipc.js b/jsonipc/jsonipc.js
@@ -1,4 +1,4 @@
-// Licensed CC0 Public Domain: http://creativecommons.org/publicdomain/zero/1.0
+// Dedicated to the Public Domain under the Unlicense: https://unlicense.org/UNLICENSE
 
 /// WebSocket handling coded needed for the Jsonipc wire marshalling
 export const Jsonipc = {

diff --git a/jsonipc/testjsonipc.cc b/jsonipc/testjsonipc.cc
@@ -1,4 +1,4 @@
-// CC0 Public Domain: http://creativecommons.org/publicdomain/zero/1.0/
+// Dedicated to the Public Domain under the Unlicense: https://unlicense.org/UNLICENSE
 #include "jsonipc.hh"
 #include <iostream>
 

diff --git a/misc/mkcopyright.py b/misc/mkcopyright.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# This Source Code Form is licensed MPL-2.0: http://mozilla.org/MPL/2.0
+# Dedicated to the Public Domain under the Unlicense: https://unlicense.org/UNLICENSE
 
 import sys, os, re, subprocess, getopt
 from datetime import datetime
@@ -15,6 +15,8 @@
                   'CC0 Public Domain: http://creativecommons.org/publicdomain/zero/1\.0/',
                   'Licensed CC0 Public Domain: http://creativecommons.org/publicdomain/zero/1\.0' ],
   'MIT':        [ 'MIT [Ll]icensed?', ],
+  'Unlicense':  [ '([Dd]edicated to|[Ii]n) the Public Domain under the Unlicense([: ]*http.*)?',
+                  'Licensed Public Domain' ],
 }
 
 # Comment suffix to ignore
@@ -185,6 +187,7 @@ def print_help (arg0, exit = None):
   h  = "Scan FILES for licenses and list copyrights from Git(1) authors.\n"
   h += "OPTIONS:\n"
   h += "  -b            Display brief license list\n"
+  h += "  -c<inifile>   Read config file in INI format\n"
   h += "  -e            Exit with a non-zero status if any files are unlicensed\n"
   h += "  -h, --help    Show command help\n"
   h += "  -l            List licensed files only\n"