License - Revision history

Peter at 19:42, 19 February 2011

2011-02-19T19:42:14Z

Peter: moved Copyright and license to License

2011-02-19T19:41:54Z

moved Copyright and license to License

Peter at 19:38, 19 February 2011

2011-02-19T19:38:03Z

Peter at 19:37, 19 February 2011

2011-02-19T19:37:07Z

Peter at 13:59, 25 March 2010

2010-03-25T13:59:10Z

Peter at 23:54, 18 January 2010

2010-01-18T23:54:02Z

Peter at 23:53, 18 January 2010

2010-01-18T23:53:32Z

Peter at 23:40, 18 January 2010

2010-01-18T23:40:17Z

Peter at 23:38, 18 January 2010

2010-01-18T23:38:27Z

Peter at 22:19, 18 January 2010

2010-01-18T22:19:13Z

← Older revision		Revision as of 19:42, 19 February 2011
Line 1:		Line 1:
−	[[Main Page]] > [[Development]] > [[Contribute code]] > ~~Copyright and license~~	+	[[Main Page]] > [[Development]] > [[Contribute code]] > License

@@ Line 19: / Line 19: @@
    # This file is part of Archivematica.
+   #
    # Archivematica is free software: you can redistribute it and/or modify

@@ Line 2: / Line 2: @@
+If you have signed the [[Contributor Agreement|Archivematica Contributors Agreement]] then your code contribution can be committed to the repository and released under Archivematica's [http://code.google.com/p/archivematica/source/browse/trunk/LICENSE GPLv2 license]. The following process must be followed to facilitate this process:
 If you are making a bug fix or enhancement to an existing file, simply add your name as one of the authors in the file header,
@@ Line 12: / Line 11: @@
    # @subpackage Ingest
    # @author Austin Trask <austin@artefactual.com>
    # @author Peter Van Garderen <peter@artefactual.com>
    # '''@author YourNameHere <youremail@address>'''

@@ Line 7: / Line 7: @@
 If you are making a bug fix or enhancement to an existing file, simply add your name as one of the authors in the file header,
-   # Run and report on virus scan
+   # Run virus scan and report on results
+   #
    # @package Archivematica
    # @subpackage Ingest
-   # @author Austin Trask <austing@artefactual.com>
+   # @author Austin Trask <austin@artefactual.com>
    # @author Peter Van Garderen <peter@artefactual.com>
    # '''@author YourNameHere <youremail@address>'''

@@ Line 32: / Line 32: @@
    # You should have received a copy of the GNU General Public License
    # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
    # '''description of what your new file does'''

@@ Line 7: / Line 7: @@
 If you are making a bug fix or enhancement to an existing file, simply add your name as one of the authors in the file header,
- /**
+   # Run and report on virus scan
-   * Run and report on virus scan
+   # @package Archivematica
-   * @package Archivematica
+   # @subpackage Ingest
-   * @subpackage Ingest
+   # @author Austin Trask <austing@artefactual.com>
-   * @author Austin Trask <austing@artefactual.com>
+   # @author Peter Van Garderen <peter@artefactual.com>
-   * @author Peter Van Garderen <peter@artefactual.com>
+   # '''@author YourNameHere <youremail@address>'''
-   * '''@author YourNameHere <youremail@address>'''
+   # @version svn: $Id$
 If you're contributing a new file, you need to add the following license header at the very top of the file. Copy both sections, in full, exactly as it is written here, filling in the information where indicated in bold,
- /*
+   # This file is part of Archivematica.
-   * This file is part of Archivematica.
+   # Archivematica is free software: you can redistribute it and/or modify
-   * Archivematica is free software: you can redistribute it and/or modify
+   # it under the terms of the GNU General Public License as published by
-   * it under the terms of the GNU General Public License as published by
+   # the Free Software Foundation, either version 2 of the License, or
-   * the Free Software Foundation, either version 2 of the License, or
+   # (at your option) any later version.
-   * (at your option) any later version.
+   # Archivematica is distributed in the hope that it will be useful,
-   * Archivematica is distributed in the hope that it will be useful,
+   # but WITHOUT ANY WARRANTY; without even the implied warranty of
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of
+   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   # GNU General Public License for more details.
-   * GNU General Public License for more details.
+   # You should have received a copy of the GNU General Public License
-   * You should have received a copy of the GNU General Public License
+   # along with Archivematica.  If not, see <http://www.gnu.org/licenses/>.
- /**
-   * '''description of what your new file does'''
+   # '''description of what your new file does'''
-−
+   #
-   * @package archivematica
+   # @package Archivematica
-   * @subpackage '''name of Archivematica module or component to which your file contributes'''
+   # @subpackage '''name of Archivematica module or component to which your file contributes'''
-   * '''@author YourNameHere <youremail@address>'''
+   # '''@author YourNameHere <youremail@address>'''
-   * @version svn: $Id:$
+   # @version svn: $Id:$

← Older revision		Revision as of 23:40, 18 January 2010
Line 3:		Line 3:


−	You will retain copyright as the original author of any code that you write and contribute to the Archivematica project. However, in order to integrate your code into Archivematica, you need to release it under the same [http://code.google.com/p/archivematica/source/browse/trunk/LICENSE GPLv2 license] ~~which~~ applies to the rest of the Archivematica project. To do so, please follow these instructions,	+	You will retain copyright as the original author of any code that you write and contribute to the Archivematica project. However, in order to integrate your code into Archivematica, you need to release it under the same [http://code.google.com/p/archivematica/source/browse/trunk/LICENSE GPLv2 license] that applies to the rest of the Archivematica project. To do so, please follow these instructions,

	If you are making a bug fix or enhancement to an existing file, simply add your name as one of the authors in the file header,		If you are making a bug fix or enhancement to an existing file, simply add your name as one of the authors in the file header,

← Older revision		Revision as of 23:38, 18 January 2010
Line 3:		Line 3:


−	You will retain copyright as the original author of any code that you write and contribute to the Archivematica project~~. This is recognized in the [http://code.google.com/p/archivematica/source/browse/trunk/COPYRIGHT COPYRIGHT file] that is distributed with the Archivematica code~~. However, in order to integrate your code into Archivematica, you need to release it under the same [http://code.google.com/p/~~qubit-toolkit~~/source/browse/trunk~~/qubit~~/LICENSE GPLv2 license] which applies to the rest of the Archivematica project. To do so, please follow these instructions,	+	You will retain copyright as the original author of any code that you write and contribute to the Archivematica project. However, in order to integrate your code into Archivematica, you need to release it under the same [http://code.google.com/p/archivematica/source/browse/trunk/LICENSE GPLv2 license] which applies to the rest of the Archivematica project. To do so, please follow these instructions,

	If you are making a bug fix or enhancement to an existing file, simply add your name as one of the authors in the file header,		If you are making a bug fix or enhancement to an existing file, simply add your name as one of the authors in the file header,