opendev/gerrit
Code Issues Proposed changes

Update license text for PrologCafe

Browse Source 
In 57b44b0cd9 f7c4000ef5 and Christian Aistleitner made some
clarifications to licenses.txt to correctly document that Gerrit
consumes PrologCafe under the EPL and offers its source code as a
Git repository available online.

Carry these over to the license file produced in a BUCK based build.

Change-Id: I16536b4716213a7371c45008e8c19c721e96132e
This commit is contained in:
Shawn Pearce
2013-05-13 09:44:25 -07:00
parent c676e446ce
commit c0e65f7911
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/licenses.py
View File

@@ -59,7 +59,7 @@ print("""\
Gerrit Code Review - Licenses Gerrit Code Review - Licenses
============================= =============================
Gerrit open source software licensed under the <<Apache2.0,Apache Gerrit open source software is licensed under the <<Apache2.0,Apache
License 2.0>>. Executable distributions also include other software License 2.0>>. Executable distributions also include other software
components that are provided under additional licenses. components that are provided under additional licenses.

6
lib/LICENSE-prologcafe
View File

@@ -11,6 +11,11 @@ it under the terms of either:
* the Eclipse Public License * the Eclipse Public License
---- ----
In the context of Gerrit Code Review, Prolog Cafe is consumed under
the <<prologcafe_EPL,EPL>>. Gerrit Code Review uses a fork derived
from the 1.2.5 release and offers the corresponding source code at
link:https://gerrit.googlesource.com/prolog-cafe[].
---- ----
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 2, June 1991
@@ -353,6 +358,7 @@ library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. Public License instead of this License.
---- ----
[[prologcafe_EPL]]
---- ----
Eclipse Public License - v 1.0 Eclipse Public License - v 1.0