Merge lp://staging/~elementary-pantheon/wingpanel-indicator-sound/licensecheck into lp://staging/~wingpanel-devs/wingpanel-indicator-sound/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 150
Merged at revision: 148
Proposed branch: lp://staging/~elementary-pantheon/wingpanel-indicator-sound/licensecheck
Merge into: lp://staging/~wingpanel-devs/wingpanel-indicator-sound/trunk
Diff against target: 994 lines (+786/-94)
10 files modified
COPYING (+679/-0)
src/Indicator.vala (+16/-16)
src/Services/MprisClient.vala (+16/-10)
src/Services/Settings.vala (+16/-16)
src/Services/Volume-control.vala (+3/-4)
src/Widgets/DisplayWidget.vala (+3/-5)
src/Widgets/MaxWidthLabel.vala (+17/-17)
src/Widgets/MprisGui.vala (+10/-5)
src/Widgets/MprisWidget.vala (+10/-5)
src/Widgets/Scale.vala (+16/-16)
To merge this branch: bzr merge lp://staging/~elementary-pantheon/wingpanel-indicator-sound/licensecheck
Reviewer Review Type Date Requested Status
Neal Gompa (community) license header text check Approve
David Hewitt Approve
WingPanel Devs Pending
Review via email: mp+315824@code.staging.launchpad.net

Commit message

* Add Copying File
* Re-license LGPL files to GPLv2

Description of the change

Okay so files that are copyright to elementary, I have re-licensed from LGPL to GPL to make it more clear how the license fits with files we don't have copyright over (specifically, the GPLv3 file that is copyright to Canonical). This way it makes it more clear how to license the repo. Everything copyright to us is GPLv2 (or later). The one copyright to Canonical is GPLv3. Therefore the overall license is GPLv3

To post a comment you must log in.
Revision history for this message
David Hewitt (davidmhewitt) :
review: Approve
Revision history for this message
Neal Gompa (ngompa13) wrote :

It looks like the license headers are slightly confused. A lot of them are one half GPLv2+ and one half LGPLv2+, which doesn't make any sense.

Could you please double-check and fix the license headers to be properly consistently GPLv2+?

review: Needs Fixing (license header text check)
148. By Danielle Foré

fix mismatched headers

149. By Danielle Foré

fix misalignment

150. By Danielle Foré

fix missing license reference

Revision history for this message
Neal Gompa (ngompa13) wrote :

Looks good!

review: Approve (license header text check)

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

to all changes: