diff --git a/COPYING b/COPYING index 420af95c9..2b3425a52 100644 --- a/COPYING +++ b/COPYING @@ -55,14 +55,6 @@ GPLv2 or newer ngspice/src/frontend/numparam LGPLv2 or newer -ngspice/src/ciderlib -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 @@ -99,53 +91,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----------------------------------- Cider ----------------------------------- - - RESEARCH SOFTWARE AGREEMENT - - This file specifies the terms under which the software and - documentation provided with this distribution are provided. - - Software is distributed as is, completely without warranty - or service support. The University of California and its employ- - ees are not liable for the condition or performance of the - software. - - The University does not warrant that it owns the copyright - or other proprietary rights to all software and documentation - provided under this agreement, notwithstanding any copyright - notice, and shall not be liable for any infringement of copyright - or proprietary rights brought by third parties against the reci- - pient of the software and documentation provided under this - agreement. - - THE UNIVERSITY OF CALIFORNIA HEREBY DISCLAIMS ALL IMPLIED - WARRANTIES, INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. THE UNIVERSITY IS NOT - LIABLE FOR ANY DAMAGES INCURRED BY THE RECIPIENT IN USE OF THE - SOFTWARE AND DOCUMENTATION, INCLUDING DIRECT, INDIRECT, SPECIAL, - INCIDENTAL, OR CONSEQUENTIAL DAMAGES. - - The University of California grants the recipient the right - to modify, copy, and redistribute the software and documentation, - both within the recipient's organization and externally, subject - to the following restrictions: - - - (a) The recipient agrees not to charge for the University of - California code itself. The recipient may, however, charge - for additions, extensions, or support. - - (b) In any product based on the software, the recipient agrees - to acknowledge the research group that developed the - software. This acknowledgement shall appear in the product - documentation. - - (c) The recipient agrees to obey all U.S. Government restric- - tions governing redistribution or export of the software and - documentation. - - ---------------------------------- Xspice -------------------------------- THE SOFTWARE PROGRAMS BELOW ARE IN THE PUBLIC DOMAIN AND ARE PROVIDED FREE OF