Merge lp://qastaging/~robert-ancell/mir/copyright-fix into lp://qastaging/~mir-team/mir/trunk
Proposed by
Robert Ancell
Status: | Merged |
---|---|
Approved by: | Robert Ancell |
Approved revision: | no longer in the source branch. |
Merged at revision: | 775 |
Proposed branch: | lp://qastaging/~robert-ancell/mir/copyright-fix |
Merge into: | lp://qastaging/~mir-team/mir/trunk |
Diff against target: |
194 lines (+171/-2) 1 file modified
debian/copyright (+171/-2) |
To merge this branch: | bzr merge lp://qastaging/~robert-ancell/mir/copyright-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Didier Roche-Tolomelli | Needs Fixing | ||
Review via email:
|
Commit message
Update debian/copyright for 3rd_party files
To post a comment you must log in.
* android- deps/std/ *
17 -Files: include/client/*, include/shared/*, src/client/*, src/shared/*
18 +Files: include/client/*, include/shared/*, src/client/*, src/shared/* 3rd_party/
-> I think this will conflict against trunk once my branch is merged in (no comma between files).
* I seems that 3rd_party/ cucumber- cpp/ has other copyright holders, I can spot in 3rd_party/ cucumber- cpp/include/ json_spirit/ json_spirit_ writer. h and other:
[Copyright: John W. Wilkinson 2007 - 2009]
for instance. I think manual grep will be necessary :/
* 3rd_party/ android- deps/sync/ sync.h: Apache (v2.0) android- deps/)
[Copyright: 2012 Google, Inc]
-> this one is missing (I would put it in the general 3rd_party/
* 3rd_party/ android- input/android/ system/ core/include/ machine/ cpu-features. h: BSD (2 clause) android- deps/android/ api-level. h: BSD (2 clause) android- deps/sys/ limits. h: BSD (2 clause)
3rd_party/
Copyright (C) 2008 The Android Open Source Project
3rd_party/
[Copyright: 2002 Marc Espie]
-> They are both BSD, not Apache 2
* 3rd_party/ android- input/android/ external/ kernel- headers/ original/ linux/input. h: GPL (v2)
[Copyright: 1999-2002 Vojtech Pavlik]
-> not apache2, but GPL2 (and not 2+, can be an issue linking with GPL3?)
* +Files: 3rd_party/ libancilliary/ *
98 +Copyright: Nicolas George
99 +License:
-> Missing License: BSD (3 clause)
+Files: 3rd_party/gmock/*
69 +Copyright: 2008, Google Inc.
70 +License:
Same, missing naming the BSD (3 clause) license.
Note that +Copyright: 2008, Google Inc. gmock/gtest/ include/ gtest/internal/ gtest-linked_ ptr.h:) - 2013 (see 3rd_party/ gmock/include/ gmock/gmock- more-matchers. h) + a lot of other years in between
should be 2003 (see 3rd_party/
* include/ test/mir_ test/gmock_ fixes.h: BSD (3 clause)
[Copyright: 2012 Canonical Ltd. 2007, Google Inc / HOLDERS AND CONTRIBUTORS]
-> this one is missing
* I'm not sure of the debian/copyright parser which is currently developping, but we have: android- deps/std/ *
3rd_party/
and later: android- deps/*
3rd_party/
Shouldn't we put the more general stenza (the second one), before the "override" one (the one with canonical copyright)
Same with 3rd_party/ android- input/android/ frameworks/ base/services/ input/MirLog. cpp?
I have no particular opinion on that particular point, a good parser should resolve it for it.