Changes between Version 8 and Version 9 of RFC2


Ignore:
Timestamp:
Aug 9, 2008, 8:28:13 AM (16 years ago)
Author:
mloskot
Comment:

A few minor improvements in RFC2

Legend:

Unmodified
Added
Removed
Modified

  • RFC2

    v8 v9  
    1414== Election to SVN Commit Access ==
    1515
    16 Permission for SVN commit access shall be provided to new developers only if accepted by the [wiki:PSC GEOS Project Steering Committee]. A proposal should be written to the PSC for new committers and voted on normally. It is not necessary to write an RFC document for these votes, a proposal to [http://lists.osgeo.org/mailman/listinfo/geos-devel geos-devel] is sufficient.
     16Permission for SVN commit access shall be provided to new developers only if accepted by the [wiki:PSC GEOS Project Steering Committee]. A proposal should be written to the PSC for new committers and voted on normally. It is not necessary to write an [http://en.wikipedia.org/wiki/Request_for_Comments RFC] document for these votes, a proposal to [http://lists.osgeo.org/mailman/listinfo/geos-devel geos-devel] is sufficient.
    1717
    1818Every developer position in the project is represented by an individual, and commit access will be granted to individuals only, group accounts are not permitted.
    … …  
    3939== SVN Administrator ==
    4040
    41 One member of the Project Steering Committee will be designed the SVN Administrator. That person will be responsible for giving SVN commit access to folks, updating the committers list, and other SVN related management.
     41One member of the Project Steering Committee will be designed the [http://svn.osgeo.org/geos/ GEOS SVN] repository Administrator. That person will be responsible for giving SVN commit access to folks, updating the committers list, and other SVN related management.
    4242
    43 Initially Mateusz Loskot will be the SVN Administrator.
     43Initially [http://mateusz.loskot.net Mateusz Loskot] will be the GEOS SVN repository administrator.
    4444
    4545== Legal Responsibilities ==
    … …  
    5050
    5151 1. The person or organization providing code understands that the code will be released under the [http://www.opensource.org/licenses/lgpl-2.1.php LGPL license].
    52  1. The person or organization providing the code has the legal right to contribute the code.
    53  1. 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 employees have permission from a supervisor or manager to contribute code the code.
     52
     53 1. The person or organization providing the code has the legal right to contribute the code.
     54
     55 1. 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 employees have permission from a supervisor or manager to contribute the code.
     56
    5457 1. 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.
    5558
    56 All unusual situations need to be discussed and/or documented.
     59All unusual situations need to be discussed, preferably on the public [http://lists.osgeo.org/mailman/listinfo/geos-devel geos-devel] mailing list, and/or documented.
    5760
    5861Committers should adhere to the following guidelines, and may be personally legally liable for improperly contributing code to the source repository:
    5962
    6063 * Make sure the contributor (and possibly employer) is aware of the contribution terms.
    61  * 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).
    62  * 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 foundation 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.
     64
     65 * 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 (see [source:trunk/COPYING COPYING] file).
     66
     67 * 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 [http://www.osgeo.org OSGeo Foundation] 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.
     68
    6369 * 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.
     70
    6471 * If there is uncertainty about whether a change is proper to contribute to the code base, please seek more information from the project steering committee, or the foundation legal counsel.
    6572
    … …  
    6976
    7077 * Use meaningful descriptions for SVN commit log entries.
    71  * Add a bug reference like "(#1232)" at the end of SVN commit log entries when committing changes related to a bug in bugzilla, so it's properly linked in the Trac pages  (see [wiki:TracLinks])
    72  * Changes should not be committed in stable branches without a corresponding bug id. Any change worth pushing into the stable version is worth a bug entry.
    73  * Never commit new features to a stable branch without permission of the PSC or release manager. Normally only fixes should go into stable branches. New features go in the main development trunk.
    74  * Only bug fixes should be committed to the code during pre-release code freeze, without permission from the PSC or release manager.
    75  * Significant changes to the main development version should be discussed on the [http://lists.osgeo.org/mailman/listinfo/geos-devel geos-devel] list before you make them, and larger changes will require a RFC approved by the PSC.
    76  * Do not create new branches without the approval of the PSC. Release managers are assumed to have permission to create a branch.
    77  * All source code in SVN should be in Unix text format as opposed to DOS text mode.
    78  * When committing new features or significant changes to existing source code, the committer should take reasonable measures to insure that the source code continues to build and work on the most commonly supported platforms (currently Linux and Windows), either by testing on those platforms directly, running [wiki:Buildbot] tests, or by getting help from other developers working on those platforms. If new files or library dependencies are added, then the configure.in, Makefile.in, Makefile.vc and related documentations should be kept up to date.
    79  * Every commit introducing new feature '''should''' be covered with corresponding test case included to the GEOS set of unit tests (trunk/tests/unit).
     78
     79 * Add a bug reference like "(#1232)" at the end of SVN commit log entries when committing changes related to an existing [wiki:TracTickets Ticket] in the GEOS Trac database, so it's properly linked on the Trac pages (see [wiki:TracLinks])
     80
     81 * Changes should not be committed in stable branches without a corresponding [wiki:TracTickets Ticket] number. Any change worth pushing into the stable version is worth a [wiki:TracTickets Ticket] entry.
     82
     83 * Never commit new features to a stable branch without permission of the [wiki:PSC PSC] or release manager. Normally only fixes should go into stable branches. New features go in the main development trunk.
     84
     85 * Only bug fixes should be committed to the code during pre-release code freeze, without permission from the [wiki:PSC PSC] or release manager.
     86
     87 * Significant changes to the main development version should be discussed on the [http://lists.osgeo.org/mailman/listinfo/geos-devel geos-devel] list before you make them, and larger changes will require a RFC approved by the [wiki:PSC PSC].
     88
     89 * Do not create new SVN [http://en.wikipedia.org/wiki/Branching_(software) branches] without the approval of the [wiki:PSC PSC]. Release managers are assumed to have permission to create a branch.
     90
     91 * All source code in SVN should be in Unix [http://en.wikipedia.org/wiki/Newline text format] (LF) as opposed to DOS (CR+LF) or Mac OS text mode (CR).
     92
     93 * When committing new features or significant changes to existing source code, the committer should take reasonable measures to insure that the source code continues to build and work on the most commonly supported platforms (currently Linux, Windows and Mac OS), either by testing on those platforms directly, running [wiki:Buildbot] tests, or by getting help from other developers working on those platforms. If new files or library dependencies are added, then the configure.in, Makefile.in, Makefile.vc and related documentations should be kept up to date.
     94
     95 * Every commit introducing new feature '''should''' be covered with corresponding test case included to the GEOS set of [source:trunk/tests/unit unit tests].
    8096
    8197