Merge lp:~renatofilho/address-book-app/fix-images-copyright into lp:address-book-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 4
Merged at revision: 6
Proposed branch: lp:~renatofilho/address-book-app/fix-images-copyright
Merge into: lp:address-book-app
Diff against target: 24 lines (+10/-0)
1 file modified
debian/copyright (+10/-0)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/fix-images-copyright
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+172326@code.launchpad.net

Commit message

Fixed images copyright.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/copyright'
2--- debian/copyright 2013-06-27 20:05:52 +0000
3+++ debian/copyright 2013-07-01 12:46:27 +0000
4@@ -4,6 +4,10 @@
5 Copyright: 2012, 2013 Canonical Ltd.
6 License: GPL-3
7
8+Files: src/artwork/*
9+Copyright: 2013 Canonical Ltd.
10+License: CC-BY-SA-3.0
11+
12 License: GPL-3
13 This program is free software: you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by
15@@ -19,3 +23,9 @@
16 .
17 On Debian systems, the full text of the GNU General Public License
18 version 3 can be found in the file /usr/share/common-licenses/GPL-3.
19+
20+License: CC-BY-SA-3.0
21+ This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
22+ Unported License. To view a copy of this license, visit
23+ http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
24+ Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.

Subscribers

People subscribed via source and target branches