about summary refs log tree commit
path: root/copyright
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2014-01-28 10:46:09 +0000
committerEric Wong <normalperson@yhbt.net>2014-01-28 10:52:21 +0000
commit820d31647725fce71d369e8d3144da5979e64cc4 (patch)
tree81f767d279e32bbae440ccaed2fd946a5b1a55fa /copyright
parent019289c67f456273da196b9ddc53510a36482e4d (diff)
downloadrpatricia-820d31647725fce71d369e8d3144da5979e64cc4.tar.gz
rpatricia license to LGPLv2.1+
Tatsuya Mori and I (Eric Wong) both agreed to license our
contributions to rpatricia under LGPLv2.1+.  Document our copyrights
and set the licenses field in the gemspec.

The original 2-clause BSD license and copyright from MRT is retained
for patricia.[ch] and explicitly documented in COPYING.  The old,
top-level copyright file was already out-of-date since we imported
the new copyright in commit 92cebfe6c81e513d24f7192328ee6b7c9d01a929

Thanks to Apollon Oikonomopoulos for all the help.
Diffstat (limited to 'copyright')
-rw-r--r--copyright34
1 files changed, 0 insertions, 34 deletions
diff --git a/copyright b/copyright
deleted file mode 100644
index 53677ed..0000000
--- a/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-Copyright (c) 1997, 1998, 1999
-
-
-The Regents of the University of Michigan ("The Regents") and Merit Network,
-Inc.  All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-1.  Redistributions of source code must retain the above
-    copyright notice, this list of conditions and the
-    following disclaimer.
-2.  Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the
-    following disclaimer in the documentation and/or other
-    materials provided with the distribution.
-3.  All advertising materials mentioning features or use of
-    this software must display the following acknowledgement:  
-This product includes software developed by the University of Michigan, Merit
-Network, Inc., and their contributors.
-4.  Neither the name of the University, Merit Network, nor the
-    names of their contributors may be used to endorse or
-    promote products derived from this software without
-    specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
-
-