with-lock-ex: Convert to MIT

Since the PD dedication is not effective in some jurisdictions.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/cprogs/with-lock-ex.c b/cprogs/with-lock-ex.c
index 2b7b45bee30c09637873123dc606aec9a9e0b64f..f10e68208b72f0ea799a5632cef219f94ea59e1a 100644 (file)
--- a/cprogs/with-lock-ex.c
+++ b/cprogs/with-lock-ex.c
@@ -22,7 +22,30 @@
  * compatibility with an earlier version).
  *
  * This file written by me, Ian Jackson, in 1993, 1994, 1995, 1996,
  * compatibility with an earlier version).
  *
  * This file written by me, Ian Jackson, in 1993, 1994, 1995, 1996,

- * 1998, 1999, 2016.  I hereby place it in the public domain.
+ * 1998, 1999, 2016.
+ *
+ * Copyright 1993-2016 Ian Jackson in some jurisdictions
+ * Copyright 2017      Ian Jackson in all jurisdictions
+ *
+ * (MIT licence:)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

diff --git a/debian/changelog b/debian/changelog
index 99b02a3f246f6997fd22de66973817d705e04f73..c3baae2f132137f9bf86a3974273eca8dc8fa127 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 chiark-utils (5.0.3~iwj) unstable; urgency=medium
 
 chiark-utils (5.0.3~iwj) unstable; urgency=medium
 

+  Copyright faff:

   * Add DEVELOPER-CERTIFICATE file and start using S-o-b practice.
   * Add DEVELOPER-CERTIFICATE file and start using S-o-b practice.

+  * Convert with-lock-ex to MIT, since the PD dedication is not
+    effective in some jurisdictions.

 
  --
 
 
  --
 

diff --git a/debian/copyright b/debian/copyright
index f629a2304eda883e3d096fb7b9627e5845ada3cd..4d40a0153d1dcd4396a61cd88a47eb1208bd7cbf 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -83,6 +83,10 @@ git-cache-proxy
  Copyright 2010 Tony Finch
  Copyright 2013,2014 Ian Jackson
 
  Copyright 2010 Tony Finch
  Copyright 2013,2014 Ian Jackson
 

+with-lock-ex
+ Copyright 1993-2016 Ian Jackson in some jurisdictions
+ Copyright 2017      Ian Jackson in all jurisdictions
+

 The chiark utilities are all free software; you can redistribute them
 and/or modify them under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 3 of the
 The chiark utilities are all free software; you can redistribute them
 and/or modify them under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 3 of the