pkgme

Merge lp://qastaging/~jml/pkgme/copyright into lp://qastaging/pkgme

  1. copyright
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: James Westby
Approved revision: 134
Merged at revision: 130
Proposed branch: lp://qastaging/~jml/pkgme/copyright
Merge into: lp://qastaging/pkgme
Diff against target: 372 lines (+148/-43)
5 files modified
pkgme/info_elements.py (+60/-28)
pkgme/package_files.py (+2/-0)
pkgme/templates/copyright (+4/-0)
pkgme/tests/test_info_elements.py (+32/-13)
pkgme/tests/test_package_files.py (+50/-2)
To merge this branch: bzr merge lp://qastaging/~jml/pkgme/copyright
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+120594@code.qastaging.launchpad.net

Commit message

Add ExplicitCopyright element for overriding default copyright.

Description of the change

As per https://bugs.launchpad.net/pkgme-devportal/+bug/1026121 we want to
be able to override the default copyright ('$year $maintainer') with custom
text from certain backends.

This branch enables that by adding an ExplicitCopyright info_element and using
that instead of $year $maintainer if it's set.

According to http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#file-syntax
the copyright field must be formatted the same way as the description field
in the control file. Thus, I extracted the debian formatting bit from description,
re-targetted the description tests against that & re-used it for copyright.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches