shim

Merge lp://staging/~helen-fornazier/shim/trunk into lp://staging/~ubuntu-core-dev/shim/trunk

Proposed by Helen M. Koike Fornazier on 2016-09-15

Status:	Merged
Merged at revision:	106
Proposed branch:	lp://staging/~helen-fornazier/shim/trunk
Merge into:	lp://staging/~ubuntu-core-dev/shim/trunk
Diff against target:	134 lines (+116/-0) 2 files modified debian/changelog (+6/-0) debian/copyright (+110/-0)
To merge this branch:	bzr merge lp://staging/~helen-fornazier/shim/trunk
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ubuntu Core Development Team		2016-09-15	Pending
Review via email: mp+305841@code.staging.launchpad.net

debian/copyright: add missing OpenSSL license
The shim-signed package was rejected by the Debian FTP team because of this missing license.

103. By Steve Langasek on 2016-09-19: New upstream release (fix-up commit)
104. By Steve Langasek on 2016-09-19: Merging shared upstream rev into target branch.
105. By Steve Langasek on 2016-09-19: Merge git into history
106. By Helen Koike <email address hidden> on 2016-09-20: [ Helen Koike ]
* debian/copyright: add OpenSSL license
[ Mathieu Trudel-Lapierre ]
* debian/copyright: patches should be BSD, like the rest of the upstream
code.