Tags:
archive_me1Add my vote for this tag create new tag
, view all tags

Proposed text for COPYRIGHT in the TWiki root

TWiki (TM) is Copyright (C) 1999-2005 Peter Thoeny, peter@thoenyPLEASENOSPAM.com and TWiki Contributors. ALL RIGHTS RESERVED. TWiki Contributors are listed in the AUTHORS file in the root of this distribution.

The following copyrights also apply to the TWiki concept and much of the code.

Proposed text for AUTHORS in the TWiki root

TWiki (TM) is copyright as described in the file COPYRIGHT in the root of this distribution and is licensed under the terms of the GNU General Public License as described in the file LICENSE accompanying this notice.

TWiki (TM) was written by Peter Thoeny, based on parts of Ward Cunningham's original Wiki and JosWiki, and has been further developed by Peter and other TWiki contributors.

A TWiki contributor is defined as a person who has contributed::

  • significant amounts of code that was accepted into the TWiki distribution, or
  • considerably to the TWiki documentation.

This topic identifies these people as authors of TWiki.

list of authors, with specific contributions where this can be established

Proposed text for COPYING

TWiki (TM) is copyright as described in the file COPYRIGHT accompanying this notice.

TWiki (TM) is licensed under the terms of the GNU General Public License as published by the Free Software Foundation. See the file LICENSE in the TWiki root for more details of your obligations when copying this work or any part of it..

Proposed text for LICENSE

TWiki (TM) is copyright as described in the file COPYRIGHT
accompanying this notice.

TWiki is open source software; you can redistribute it 
and/or modify it under the terms of the GNU General Public 
License as published by the Free Software Foundation; 
either version 2 of the License, or (at your option) any 
later version. We would appreciate it if redistributions
and derivatives of TWiki retained the entire content of
the files COPYRIGHT, LICENSE, AUTHORS and COPYING, thus
acknowledging the origin of TWiki and the thousands of
hours put into creating this software.

This program is distributed in the hope that it will be 
useful, but WITHOUT ANY WARRANTY; without even the implied 
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
PURPOSE.

See the GNU General Public License for more details,
attached below for your convenience, as published at
http://www.gnu.org/copyleft/gpl.html; embedding in 
proprietary software requires an alternative license. 
For details, please contact the authors at 
twiki-dev@lists.sourceforge.net

Peter Thoeny, Peter@Thoeny.com, http://TWiki.org/

-----( http://www.gnu.org/copyleft/gpl.html )------------------------------
snipped the duplicated GPL

Proposed text for source file header

# TWiki Enterprise Collaboration Platform, http://TWiki.org/
#
# Copyright (C) 1999-2005 Peter Thoeny, peter@thoeny.com
# and TWiki Contributors. All Rights Reserved. TWiki Contributors
# are listed in the AUTHORS file in the root of this distribution.
# NOTE: Please extend that file, not this notice.
#
# Additional copyrights apply to some or all of the code in this
# file as follows:
specific copyrights applying to code in this file
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. For
# more details read LICENSE in the root of this distribution.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# As per the GPL, removal of this notice is prohibited.

Discussion

I've been struggling in the DEVELOP branch with how to handle assertion of my copyright over some rather large blocks of code I have contributed. I really want to ensure that everyone's copyrights and contributions are acknowledged, but at the moment there is a mixture of copyright notices, some valid, some clearly not, and the code is further peppered with individual "I did this" comments. The current banner really needs to be updated.

On a careful reading of the GPL and a discussion on IRC, I think the fairest thing to do is to adjust the current notice as follows (borrowing from the Kupu project via the Kamelia project). (I can't easily show changes because the notice is used inconsistently throughout the TWiki code)

Refactored out; see above for negotiated version

Peter's version, based on the original text and above text:

Refactored out: see above for negotiated version

It is really important to me that everyone who contributes or asserts a copyright has that acknowledged, and we are not doing this adequately at present, so I'm warning everyone that I'm going to do this to give you a chance to flame.

-- CrawfordCurrie - 07 Jan 2005

This sounds like a good idea - I recall quite a lot of discussion about this back in Aug 03 onwards, though I hope this time we can get this sorted out in an amicable way smile

I don't think the offer of alternative licensing is a good idea, as it would be virtually impossible to contact all copyright holders in any case, and this raises expectations that it is possible. Those who prefer TWiki to only be GPLed may also not like this clause.

I think reference to MPL/LGPL should be removed as they don't apply (GPL prevents modification of copyright notice anyway) and could cause confusion.

I've updated the year in the copyright notice to 2005.

-- RichardDonkin - 07 Jan 2005

Broke your lock in the hope you'd finished editing. I rather liked the "alternative licensing" as it seemed more encouraging to me, somehow. And it would be worth a try. Changed it to "just GPL".

-- CrawfordCurrie - 07 Jan 2005

I think this is a good idea Crawford. In my very small and no longer needed contribution I spent some time wondering how to attribute so that it was apparent that somebody besides Peter did the work, and stayed away from making it look like I was claiming too much. smile

I for one don't mind dual licensing schemes, so long as one of them is GPL.

-- MattWilkie - 07 Jan 2005

I agree.

-- MartinCleaver - 07 Jan 2005

It is really important to acknowledge contributors properly, and as Richard pointed out we can do this now in an amicable way. We improved it over time with the TWikiContributor text, but we are still short of actually listed who did what. I encourage everyone to help update that topic.

I noticed that Crawford changed already all headers to make them look alike, which is good. One change needs to be reverted though. We should never remove copyright text on a file. (I was guilty of that myself before I understood the copyright). In our case this would discredit the original JosWiki folks Markus Peter and Dave Harris. So, we should restore the copyright notice with date as it was for each file exactly as it was before (in the CairoRelease). In addition we can add the note about the TWikiContributors topic. Also, the top of the header should state that the file belongs to TWiki, and we should keep the warranty disclaimer.

I added a modified version at the top of this topic. We should agree on and merge Crawford's proposed text and my proposed text, then change all header files accordingly.

Lastly, agreed with Matt, dual licensing would be fine with me as long as one remains GPL.

-- PeterThoeny - 11 Jan 2005

Not so. The idea of the shorter text is that TWikiContributors contains the relevant acknowledgements. There is no requirement to acknowledge individual copyrights in individual files, as long as the copyright is acknowledged alongside all other copyrights. I didn't check it in yet, but this is the change I made to TWikiContributors to reflect this:

TWiki Copyrights

TWiki was originally made by Peter Thoeny, based on parts of Ward Cunninghams original Wiki and JosWiki, Some changes by Dave Harris (drh@bhresearchPLEASENOSPAM.co.uk) were also incorporated. The following copyrights apply to the TWiki concept and much of the code.

Other copyrights apply in different parts of the code, as indicated in specific code header comments.

TWiki Contributors

A TWiki contributor is defined as a person who has contributed::

  • significant amounts of code that was accepted into the TWiki distribution, or
  • considerably to the TWiki documentation.

This topic identifies these people as authors of TWiki.

...

Note that the only difference between acknowledging copyright globally like this and acknowledging it on an individual file basis is the granularity of the acknowledgement. Acknowledge it in a file, and the acknowledgement applies to that file only. The reason I removed the notices from individual files was in anticipation of this change. When TWiki was modularised a long time ago, code was moved without the original notices, and some code is therefore no longer correctly credited. Rather than try to unthread all the attributions, I felt it was better to make a global attribution for that original work.

There is no need to duplicate the license text and the denial of warranty in every file. A reference should suffice.

Note that several people have suggested we should move to using AUTHORS, LICENSE and COPYING as per the CPAN standard. I'm inclined to agree (though it's not a big deal IMHO).

I'd be happy to compromise on this:

refactored into proposal at the top of this topic

-- CrawfordCurrie - 11 Jan 2005

Given the various code relocations due to modularisations, I think that Crawford's argument for a single global TWikiContributors list, including original copyrights, makes sense. Peter, do you agree on this? Would clean things up and would in fact be more accurate.

-- RichardDonkin - 11 Jan 2005

I thought it worth mentioning how contribution for the release summaries was/will be done, from point 11 of the ProposedNewFormsInCodev#Design_Decisions

The AssignedToCore and AssignedTo fields were removed so as not to discourage input by others. However they were also important for crediting the contributors (see autogenerated CairoReleaseSummary, used to update TWikiHistory before the release) so a TWikiContributors field was added for this purpose. This should hopefully not discorage others from contributing and also makes the crediting process more transparent.

I assumed that the contributers from the release summaries were also added to the TWikiContributors topic but there are names on CairoReleaseSummary that do not appear on TWikiContributors.

-- SamHasler - 11 Jan 2005

Crawford, I think we agree that the TWikiContributors topic contains the relevant acknowledgements for the current TWiki. Where I disagree is to remove or move the original copyright text from copyrighted files. It is important to never do that, I feel strongly about this. That is, the following text must be restored for files that had it, and also for files where large part of the original code was refactored out (such as part of TWiki.pm into Render.pm) :

# Based on parts of Ward Cunninghams original Wiki and JosWiki.
# Copyright (C) 1998 Markus Peter - SPiN GmbH (warpi@spin.de)
# Some changes by Dave Harris (drh@bhresearch.co.uk) incorporated.
# [and/or whatever other copyright text was originally in the file]

Newer code do not have that / do need that, for example Meta.pm is new code that has nothing to do with JosWiki.

The common theme is to put the copyright info into individual files. I do not believe we need a "TWiki Copyrights" section in the TWikiContributors topic.

Also, I am not in favor of the wording "TWiki was originally made by Peter Thoeny" because it sounds like an invitation for me to stop contributing.

The more I think about it, the stronger feel about the version I proposed on top. I removed the "Please contact" part since there is no need to repeat that in every file. Is there an argument to make the header shorter?

Attributing contributions is important. Last November, Crawford started to list "who did what" in TWikiContributor. I spent quite some time to update that based on the TWikiHistory, but there are still holes. Everyone's help to bring this to completion this is appreciated smile

-- PeterThoeny - 12 Jan 2005

I'm not hung up on this, and I have no problem restoring the copyright notices in the files, but I am concerned that by doing so we are discriditing original authors. Maybe I didn't make myself clear above; I was not talking about copyrights removed in the recent (LocationLocationLocation) modularisation - I was talking about the fact that we have (accidentally I am sure) discredited the authors of code that was moved during the original (200/2001) modularisation. Personally I am not going to trawl back through the CVS history to correct those credits on a file-by-file basis, so from this perspective we need we the global acknowledgement, If we have this, I can't see the argument for credits in each file.

The rationale for a short file notice is manifold:

  1. Maintaining file-by-file copyrights, where many authors are concerned, is the beuracratic nightmare that brought us to this current situation.
  2. Global accreditation is fairer; it acknowledges the copyright/authorship of people who contribute one line as fairly as those that contribute 1000.
  3. A short file notice with no list of copyright acknowledgements is less likely to be munged by new authors.
  4. There is less risk that people will assume that persons listed at the top of the source file are the only copyright owners. Otherwise they might accidentally discredit others (as has happened in the past).
  5. People who re-use code from TWiki have an easier time, because they only need to merge the LICENSE and not the notice from each individual file.
But I'm not going to fight city hall on this one.

Sorry about the "originally made" - I was trying to find a form of words that reflected your original authorship while also acknowledging that TWiki was built from an original work (JosWiki) and has since been extensively contributed to by yourself and others. I guess I got that wrong. I changed "originally made" to "written".

I kind of went off the idea of listing specific contributions because of the difficulty of nailing them down. I spent some time looking through svn logs to see if there was a rational way to extract that, but I gave up after a while.

You didn't comment on the proposal to standardise license.txt as LICENSE, copyrights in COPYRIGHT and TWikiContributor.txt as AUTHORS (as per the standard); I incorporated that change in the proposal above. The idea would be to make AUTHORS the master, and TWikiContributor.txt a derived object generated by the release scripts; though that could be reversed if preferred.

I refactored out the proposals to create what is at the head of this topic; please make further changes directly in that text.

-- CrawfordCurrie - 12 Jan 2005

changed 'Cunninghams' to possessive "Cunningham's" in Proposed AUTHORS text. -- MattWilkie - 12 Jan 2005

Executed - DevelopBranch r3747 -- CrawfordCurrie - 05 Mar 2005

i believe the following text should be removed

Please note that TWiki is NOT distributed under the LGPL
(Lesser General Public Licence), which implies TWiki can
only be used with software that is licensed under conditions
compliant with the GPL. 
as the GPL addresses (re-)distribution, not use; see http://www.gnu.org/licenses/gpl-faq.html#TOCGPLRequireSourcePostedPublic

-- WillNorris - 13 Apr 2005

Muy bueno el tema

-- LuisFelipeVillamizarTorres - 2010-06-04

ChangeProposalForm
TopicClassification DocRequest
TopicSummary Simplify and standardise file header notice and ensure all attributions are correct
CurrentState MergedToCore
OutstandingIssues Need Peter's agreement on the move to standard AUTHORS etc files; the text of the files; and the text of the source file header.
RelatedTopics

InterestedParties

ProposedFor DakarRelease
TWikiContributors

Edit | Attach | Watch | Print version | History: r25 < r24 < r23 < r22 < r21 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r25 - 2010-06-04 - LuisFelipeVillamizarTorres
 
  • Learn about TWiki  
  • Download TWiki
This site is powered by the TWiki collaboration platform Powered by Perl Hosted by OICcam.com Ideas, requests, problems regarding TWiki? Send feedback. Ask community in the support forum.
Copyright © 1999-2017 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.