i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some licensing mistakes from over the weekend. Mistakenly grouped cortex,

Browse Source 
xiph, and tcpdump with mkdepend's license.
 * Re-added MkDepend as a license
 * Removed BSD (Alternate 3-clause)
 * Modified BSD licenses to match http://en.wikipedia.org/wiki/BSD_license


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35995 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-03-29 16:47:57 +00:00
parent 42581cdc8c
commit c98bab29e9
5 changed files with 86 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/system/data/licenses/BSD (2-clause)
+25 -25
View File
@@ -1,25 +1,25 @@
/*- Copyright <year> <copyright holder>. All rights reserved.
* Copyright (c) <year> <copyright holder>.
* All rights reserved. Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions 1. Redistributions of source code must retain the above copyright notice, this list of
* are met: conditions and the following disclaimer.
* 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
* without modification, immediately at the beginning of the file. of conditions and the following disclaimer in the documentation and/or other materials
* 2. The name of the author may not be used to endorse or promote products provided with the distribution.
* derived from this software without specific prior written permission.
* THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* 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 The views and conclusions contained in the software and documentation are those of the
* SUCH DAMAGE. authors and should not be interpreted as representing official policies, either expressed
*/ or implied, of <copyright holder>.
data/system/data/licenses/BSD (3-clause)
+24 -28
View File
@@ -1,28 +1,24 @@
/*- Copyright (c) <year>, <copyright holder>
* Copyright (c) <year> All rights reserved.
* The Regents of the University of California. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* modification, are permitted provided that the following conditions * Redistributions of source code must retain the above copyright
* are met: notice, this list of conditions and the following disclaimer.
* 1. Redistributions of source code must retain the above copyright * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer in the
* 2. Redistributions in binary form must reproduce the above copyright documentation and/or other materials provided with the distribution.
* notice, this list of conditions and the following disclaimer in the * Neither the name of the <organization> nor the
* documentation and/or other materials provided with the distribution. names of its contributors may be used to endorse or promote products
* 4. Neither the name of the University nor the names of its contributors derived from this software without specific prior written permission.
* may be used to endorse or promote products derived from this software
* without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* 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.
*/
data/system/data/licenses/BSD (4-clause)
+27 -32
View File
@@ -1,32 +1,27 @@
/*- Copyright (c) <year>, <copyright holder>
* Copyright (c) <year> All rights reserved.
* The Regents of the University of California. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* modification, are permitted provided that the following conditions 1. Redistributions of source code must retain the above copyright
* are met: notice, this list of conditions and the following disclaimer.
* 1. Redistributions of source code must retain the above copyright 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer in the
* 2. Redistributions in binary form must reproduce the above copyright documentation and/or other materials provided with the distribution.
* notice, this list of conditions and the following disclaimer in the 3. All advertising materials mentioning features or use of this software
* documentation and/or other materials provided with the distribution. must display the following acknowledgement:
* 3. All advertising materials mentioning features or use of this software This product includes software developed by the <organization>.
* must display the following acknowledgement: 4. Neither the name of the <organization> nor the
* This product includes software developed by the University of names of its contributors may be used to endorse or promote products
* California, Berkeley and its contributors. derived from this software without specific prior written permission.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY
* without specific prior written permission. EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* 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.
*/
data/system/data/licenses/BSD (Alternate 3-clause) → data/system/data/licenses/MkDepend
+5 -1
View File
@@ -1,4 +1,6 @@
Copyright (c) <year> MkDepend License
Copyright (c) 1995-2000, Lars Düning.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@@ -22,3 +24,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THE SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
$Id: LICENSE 1.2 Wed, 01 Mar 2000 21:15:40 -0700 lars $
src/apps/aboutsystem/AboutSystem.cpp
+5 -4
View File
@@ -1172,6 +1172,7 @@ AboutView::_CreateCreditsView()
"Mesa3D Project. All rights reserved.") "Mesa3D Project. All rights reserved.")
.SetURL("http://www.mesa3d.org")); .SetURL("http://www.mesa3d.org"));
// TODO: License! // TODO: License!
// NOTE: http://www.mesa3d.org/license.html
// SGI's GLU implementation copyrights // SGI's GLU implementation copyrights
_AddPackageCredit(PackageCredit("GLU") _AddPackageCredit(PackageCredit("GLU")
@@ -1306,7 +1307,7 @@ AboutView::_CreateCreditsView()
// cortex copyrights // cortex copyrights
_AddPackageCredit(PackageCredit("Cortex") _AddPackageCredit(PackageCredit("Cortex")
.SetCopyright(COPYRIGHT_STRING "1999-2000 Eric Moon.") .SetCopyright(COPYRIGHT_STRING "1999-2000 Eric Moon.")
.SetLicense("BSD (Alternate 3-clause)") .SetLicense("BSD (3-clause)")
.SetURL("http://cortex.sourceforge.net/documentation")); .SetURL("http://cortex.sourceforge.net/documentation"));
// FluidSynth copyrights // FluidSynth copyrights
@@ -1342,13 +1343,13 @@ AboutView::_CreateCreditsView()
COPYRIGHT_STRING "1994-2008 Xiph.Org. " COPYRIGHT_STRING "1994-2008 Xiph.Org. "
"All rights reserved.", "All rights reserved.",
NULL) NULL)
.SetLicense("BSD (Alternate 3-clause)") .SetLicense("BSD (3-clause)")
.SetURL("http://www.xiph.org")); .SetURL("http://www.xiph.org"));
// The Tcpdump Group // The Tcpdump Group
_AddPackageCredit(PackageCredit("The Tcpdump Group") _AddPackageCredit(PackageCredit("The Tcpdump Group")
.SetCopyright("tcpdump, libpcap") .SetCopyright("tcpdump, libpcap")
.SetLicense("BSD (Alternate 3-clause)") .SetLicense("BSD (3-clause)")
.SetURL("http://www.tcpdump.org")); .SetURL("http://www.tcpdump.org"));
// Matroska // Matroska
@@ -1376,7 +1377,7 @@ AboutView::_CreateCreditsView()
_AddPackageCredit(PackageCredit("MkDepend") _AddPackageCredit(PackageCredit("MkDepend")
.SetCopyright(COPYRIGHT_STRING "1995-2001 Lars Düning. " .SetCopyright(COPYRIGHT_STRING "1995-2001 Lars Düning. "
"All rights reserved.") "All rights reserved.")
.SetLicense("BSD (Alternate 3-clause)") .SetLicense("MkDepend")
.SetURL("http://bearnip.com/lars/be")); .SetURL("http://bearnip.com/lars/be"));
// libhttpd copyright (used as Poorman backend) // libhttpd copyright (used as Poorman backend)