From 92f7cbcf074f6baa6c80702ad7ddb6ee6bf3e4f7 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Fri, 18 Jan 2019 15:30:46 +0100 Subject: [PATCH 1/2] Updating the legal section to align it with the OSGeo recommendations and adding a section with the list of current copyright holders. --- CONTRIB.md | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/CONTRIB.md b/CONTRIB.md index b33607e9b4..2d66dc4948 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -184,6 +184,65 @@ code. For the committer themselves understanding about the license is hopefully committer should verify the understanding unless the committer is very comfortable that the contributor understands the license (for instance frequent contributors). -All committers are responsible for having read, and understood this document. And please confirm acceptance to these +If the contribution was developed on behalf of an employer (on work time, as part of a work project, etc) then it is +important that an appropriate representative of the employer understand that the code will be contributed under the +LGPL license. The arrangement should be cleared with an authorized supervisor, manager, or director. + +The code should be developed by the contributor, or the code should be from a source which can be rightfully contributed +such as from the public domain, or from an open source project under a compatible license. All unusual situations need +to be discussed with the committee members and documented. + +Committers should adhere to the following guidelines, and may be personally legally liable for improperly contributing +code to the source repository: + +- Make sure the contributor (and possibly employer) is aware of the contribution terms. +- Code coming from a source other than the contributor (such as adapted from another project) should be clearly marked +as to the original source, copyright holders, license terms and so forth. This information can be in the file headers, +but should also be added to the project licensing file if not exactly matching normal project licensing (LICENSE.txt). +- Existing copyright headers and license text should never be stripped from a file. If a copyright holder wishes to give + up copyright they must do so in writing to the committees before copyright messages are removed. If license terms are + changed it has to be by agreement (written in email is ok) of the copyright holders. +- Code with licenses requiring credit, or disclosure to users should be added to LICENSE.TXT. +- When substantial contributions are added to a file (such as substantial patches) the author/contributor should be added + to the list of copyright holders for the file. +- If there is uncertainty about whether a change it proper to contribute to the code base, please seek more information +from the project steering committee, or the OSGeo foundation legal counsel. + +All committers are responsible for having read, and understood this document. And confirm acceptance to these guidelines by sending an email to the mailing list with subject `Committer guidelines acceptance` and body -`I hereby accept the deegree committer guidelines. `. \ No newline at end of file +`I hereby accept the deegree committer guidelines. `. + +## Copyright holders + +The following list of committers (alphabetical order) will be considered as authorized deegree committers and copyright holders: +- Andrei Aiordachioaie +- Rutger Bezema +- Florian Bingel +- Reijer Copier +- Alexander Erben +- Lyn Goltz +- Sebastian Goerke +- Torsten Friebe +- Jerry Huxtable +- Andrei Ionita +- Christian Kiehle +- Ulrich Neumeister +- Mike Nidel +- Sebastian Niklasch +- Jens Pabel +- Alexander Padberg +- Andreas Poth +- Rammi aka Andreas M. Rammelt +- Stephan Reichhelm +- Andreas Schmitz +- Markus Schneider +- Dirk Stenger +- Jason R. Surratt +- Ugo Taddei +- Steffen Thomas +- Oliver Tonnhofer +- Sven Tschirner +- Georg Walenciak +- Jeronimo Wanhoff +- Juergen Weichand +- Johannes Wilden From cd584855d2a0ceb8dec7dc5fbf816c0e605470c4 Mon Sep 17 00:00:00 2001 From: Torsten Friebe Date: Fri, 1 Mar 2019 20:47:56 +0100 Subject: [PATCH 2/2] Split list of contributors from guidelines --- CONTRIB.md | 34 --------------------------------- CONTRIBUTORS.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 +++- 3 files changed, 54 insertions(+), 35 deletions(-) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIB.md b/CONTRIB.md index 2d66dc4948..6dc4418502 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -212,37 +212,3 @@ All committers are responsible for having read, and understood this document. An guidelines by sending an email to the mailing list with subject `Committer guidelines acceptance` and body `I hereby accept the deegree committer guidelines. `. -## Copyright holders - -The following list of committers (alphabetical order) will be considered as authorized deegree committers and copyright holders: -- Andrei Aiordachioaie -- Rutger Bezema -- Florian Bingel -- Reijer Copier -- Alexander Erben -- Lyn Goltz -- Sebastian Goerke -- Torsten Friebe -- Jerry Huxtable -- Andrei Ionita -- Christian Kiehle -- Ulrich Neumeister -- Mike Nidel -- Sebastian Niklasch -- Jens Pabel -- Alexander Padberg -- Andreas Poth -- Rammi aka Andreas M. Rammelt -- Stephan Reichhelm -- Andreas Schmitz -- Markus Schneider -- Dirk Stenger -- Jason R. Surratt -- Ugo Taddei -- Steffen Thomas -- Oliver Tonnhofer -- Sven Tschirner -- Georg Walenciak -- Jeronimo Wanhoff -- Juergen Weichand -- Johannes Wilden diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 0000000000..b7fe3d4ff2 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,51 @@ +# List of contributors + +The following list shows in alphabetical order individuals who have contributed to deegree: +- Andrei Aiordachioaie +- D. Baum +- Rutger Bezema +- Florian Bingel +- Danilo Bretschneider +- Reijer Copier +- Alexander Erben +- Lyn Goltz +- Sebastian Goerke +- Volker Grabsch +- Torsten Friebe +- Jerry Huxtable +- Andrei Ionita +- Mats Isakson +- Christian Kiehle +- Martin W. Kirst +- Johannes Küpper +- Anne Loos +- Matteo Matassoni +- Diego Migliavacca +- Ulrich Neumeister +- Mike Nidel +- Sebastian Niklasch +- Jens Pabel +- Alexander Padberg +- Jarle Pedersen +- Andreas Poth +- Rammi aka Andreas M. Rammelt +- Stephan Reichhelm +- Lena Rippolz +- Hanko Rubach +- Andreas Schmitz +- Markus Schneider +- Paul Sohier +- Dirk Stenger +- Jason R. Surratt +- Ugo Taddei +- Carmen Tawalika +- Steffen Thomas +- Oliver Tonnhofer +- Sven Tschirner +- Jeroen van der Vegt +- Martin Vieweg +- Jeroen ter Voorde +- Georg Walenciak +- Jeronimo Wanhoff +- Juergen Weichand +- Johannes Wilden \ No newline at end of file diff --git a/README.md b/README.md index d5a8449d19..eb7d6cf034 100644 --- a/README.md +++ b/README.md @@ -27,4 +27,6 @@ More information about free software can be found at the free software foundatio First off all, thank you for taking the time to contribute to deegree! :+1: :tada: -By participating you are expected to uphold the [Contribution guidelines](CONTRIB.md). \ No newline at end of file +By participating you are expected to uphold the [Contribution guidelines](CONTRIB.md). + +You can add yourself when contributing to the project to the [list of contributors](CONTRIBUTORS.md). \ No newline at end of file