Parent Directory
| 
Revision Log
| Sticky Revision: |
CANDIDATE version of DEP5.
Add note to start of DEP5 to point at the wiki page.
Fix write anchor tag by hand (Markdown parsing disabled inside html tags).
Replace dep5 with mirror of more recent development snapshot (2nd attempt: apparently inline and template plugins are not enabled here, so need to merge less elegantly by hand).
Replace dep5 with mirror of more recent development snapshot.
update all the sample Format-Specification revisions to the current rev
Copyright field got marked 'optional' somewhere along the way, seemingly without discussion. Since the only case for omitting this would seem to have been 'public domain', and the spec is updated to say this information also belongs in the copyright field, let's mark this (and the License field) as required, at least pending further discussion.
fix up the bad examples in the spec to not fail policy and license requiremnts!
reiterate that the license text must be included, that a short name is not an adequate pointer
clarify that the license short names are reserved and must only be used for these licenses, and spell out the rules for implementors to safely rely on the meaning of these tokens
fix word wrap to 80 columns
public domain falls under 'copyright', not 'license'.
clean up the explanation of the License field's extra lines: - clarify that if this is blank, there must be a stand-alone License stanza - clarify that "link to the license" should only apply for licenses in /usr/share/common-licenses (a Policy requirement) - be explicit that this field needs to contain *all* the text required for compliance both with Policy and with the license itself.
don't list the php license, since it's still marked as 'problematic'
only one license per file can use the default name of 'other' - clarify that any other non-standard licenses *must* have unique short names assigned to them locally, and that these tags have no meaning outside the current copyright file
BSD-C2/BSD-C3 -> BSD, consistent with the current shortname list
cosmetic-only changes: clean up spelling/grammar, mark the field syntax definitions with 'Syntax:', clarify language where necessary, and drop some accidentally duplicated text
clean up some factual errors in the introduction
LGPL-OpenSSL isn't special after all, pull it out again. Tighten up the text around exceptions/clarifications (the GPL exceptions are all exceptions and should be documented as such) Restore the text of the GPL exceptions in question, these should not be left undefined since we want any short names defined in this document to be unambiguous.
restore a couple of licenses to the list that were dropped, but warrant their own mention
merge revisions 31-40 from bzr to svn (by hand; bzr-svn no longer wants to play nice in this configuration, see sftp://bzr.debian.org/bzr/dep/dep5/trunk/ for full history)
drop other drivers due to seemingly unreconcilable disagreements over how to handle the DEP process itself. DEP drivers can be readded when agreement is reached.
commit the merge
Cherry pick from Plessy's branch: revno: 30 committer: Charles Plessy <plessy@debian.org> branch nick: dep5 timestamp: Mon 2009-04-13 10:35:35 +0900 message: Use the GNU all permissive license as it is confirmed that its wording is clear. See the following URI for one of the originals: http://www.gnu.org/software/hello/manual/texinfo/All_002dpermissive-Copying-License.html
merge from Plessy
restore the requirement that Name, Maintainer, Source, Disclaimer fields occur only once; drop the 'Suggested name' for Disclaimer, this simply repeats the section header
restore the Format-Specification field, pending more public discussion
revert unbranding. DEP == Debian Enhancement Proposal; upstreamage should come later, as part of public discussion.
merge the out-of-sync changes from svn back into bzr
Unbranding.
Slimming down… - Suppression of the 'Format' field. - The 'Copyright' field is free form, and the copyright symbol was removed from the examples. - Licence "keywords" are renamed "short names". - Exemption are signalled in english, not with a "BY" syntax. - I simplified the table of licences. I can add URLs back later when it is time for polishing. - BSD licenses are referred by their name. The "original BSD" issue is not a problem since the relicensing has retro-active effect. I think that we can use the same keyword for the 4- and 3- clause version. - All of this was the kiss of death for the EBNF, so I removed it, and the recommendations for clear copyrighting as well.
Replaced pipes and commas by `or`s and `and`s.
Added Simon as a driver.
Sync. with SVN version 37.
fix the syntax of the toc directive
finish proofreading; trying *oh so hard* not to intermingle substantive changes...
partial proofreading
update the format-specification examples to point at svn.d.o
fix the DEP header, which has to be indented to look sane under markdown - not truly RFC822 then :(
initial import of wiki.d.o/Proposals/CopyrightFormat as DEP5
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| ViewVC Help | |
| Powered by ViewVC 1.1.5 |