From ce310fe2faf10192ebe3782fa38042193b556581 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Thu, 22 Feb 2018 10:41:52 +0100 Subject: [PATCH] update, especially concerning CIDER We will have to contact USB officials to obtain a re-licensing of CIDER. --- COPYING | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/COPYING b/COPYING index 8c7105c65..273708829 100644 --- a/COPYING +++ b/COPYING @@ -1,8 +1,8 @@ 12345678901234567890123456789012345678901234567890123456789012345678901234567890 Ngspice 27+ -Copyright (c) 2017, +Copyright (c) 2018, All rights reserved. -license for this documant: CC-BY-SA v4.0 +license for this document: CC-BY-SA v4.0 **************************** ngspice license ********************************** @@ -13,12 +13,6 @@ others). Thus a mixture of license statements prevails. The ngspice license is the `Modified BSD' license. This is adopted for all of its source code, test and example files except for the files listed below. -CIDER is covered New BSD according to UCB officials, but this re-licensing is -still under discussion -(see https://lists.debian.org/debian-legal/2016/10/msg00022.html), -and therefore CIDER may not be made available in all software distributions. - - ************** files with licenses different to 'Modified BSD' **************** * ngspice/doc @@ -62,17 +56,21 @@ ngspice\src\frontend\numparam LGPLv2 or newer ngspice\src\ciderlib -UCB agreed to put this under New BSD, but still under discussion +CIDER is distributed with its own license (see below) that is not compatible +to DFSG (https://embedded.eecs.berkeley.edu/pubs/downloads/cider/index.htm). +CIDER shall be covered New BSD according to UCB officials, but this +re-licensing is still under discussion +(see https://lists.debian.org/debian-legal/2016/10/msg00022.html). +Therefore CIDER may not be made available in all software distributions. ngspice manual (see https://sourceforge.net/p/ngspice/ngspice-manuals/ci/master/tree/) Creative Commons Attribution Share-Alike (CC-BY-SA) v4.0 - -------------------------------------- ngspice --------------------------------- ---------------------------------- 'Modified BSD' ------------------------------ -Copyright 1985 - 2017, Regents of the University of California and others +Copyright 1985 - 2018, Regents of the University of California and others Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: