Merge ~powersj/cloud-init:xenial/fix-debian-copyright into cloud-init:ubuntu/xenial

Proposed by Joshua Powers on 2017-09-21
Status: Merged
Merged at revision: 95cd0fe622db84fd5f2ad9de0cfabb9b62c3c5fd
Proposed branch: ~powersj/cloud-init:xenial/fix-debian-copyright
Merge into: cloud-init:ubuntu/xenial
Diff against target: 82 lines (+31/-18)
1 file modified
debian/copyright (+31/-18)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2017-09-28
Ryan Harper 2017-09-21 Needs Fixing on 2017-09-22
Review via email: mp+331173@code.launchpad.net

Commit message

d/copyright: Reorganize file, add Apache 2.0 license

The license was updated to be dual-licensed under Apache 2.0 and
GPL 3.0, however, the text of the Apache 2.0 license was not added
to the debian/copyright file.

The file was also updated to be lintian clean and reorganized to
list the licenses at the bottom after declaring the metadata and
file information.

LP: #1718681

To post a comment you must log in.

PASSED: Continuous integration, rev:c75086d415fb880b03ab39275c1f0eb4f6a42f58
https://jenkins.ubuntu.com/server/job/cloud-init-ci/345/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/345/rebuild

review: Approve (continuous-integration)
Ryan Harper (raharper) :
review: Needs Fixing
Joshua Powers (powersj) :
fa4a700... by Joshua Powers on 2017-09-28

push licences to end, line continue, headers.

PASSED: Continuous integration, rev:fa4a700f24ccd0fe727ead533d54feb032379f20
https://jenkins.ubuntu.com/server/job/cloud-init-ci/359/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/359/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/copyright b/debian/copyright
2index cf4a76f..c223670 100644
3--- a/debian/copyright
4+++ b/debian/copyright
5@@ -1,35 +1,48 @@
6-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
7-Name: cloud-init
8-Maintainer: Scott Moser <scott.moser@canonical.com>
9+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
10+Upstream-Name: cloud-init
11+Upstream-Contact: cloud-init-dev@lists.launchpad.net
12 Source: https://launchpad.net/cloud-init
13
14-This package was debianized by Soren Hansen <soren@ubuntu.com> on
15-Thu, 04 Sep 2008 12:49:15 +0200 as ec2-init. It was later renamed to
16-cloud-utils by Scott Moser <scott.moser@canonical.com>
17-
18-Upstream Author: Scott Moser <smoser@canonical.com>
19- Soren Hansen <soren@canonical.com>
20- Chuck Short <chuck.short@canonical.com>
21-
22+Files: *
23 Copyright: 2010, Canonical Ltd.
24 License: GPL-3 or Apache-2.0
25+
26+Files: cloudinit/boto_utils.py
27+Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/
28+License: MIT
29+
30+License: GPL-3
31 This program is free software: you can redistribute it and/or modify
32 it under the terms of the GNU General Public License version 3, as
33 published by the Free Software Foundation.
34-
35+ .
36 This program is distributed in the hope that it will be useful,
37 but WITHOUT ANY WARRANTY; without even the implied warranty of
38 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
39 GNU General Public License for more details.
40-
41+ .
42 You should have received a copy of the GNU General Public License
43 along with this program. If not, see <http://www.gnu.org/licenses/>.
44-
45+ .
46 The complete text of the GPL version 3 can be seen in
47 /usr/share/common-licenses/GPL-3.
48
49-Files: cloudinit/boto_utils.py
50-Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/
51+License: Apache-2.0
52+ Licensed under the Apache License, Version 2.0 (the "License");
53+ you may not use this file except in compliance with the License.
54+ You may obtain a copy of the License at
55+ .
56+ http://www.apache.org/licenses/LICENSE-2.0
57+ .
58+ Unless required by applicable law or agreed to in writing, software
59+ distributed under the License is distributed on an "AS IS" BASIS,
60+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
61+ See the License for the specific language governing permissions and
62+ limitations under the License.
63+ .
64+ On Debian-based systems the full text of the Apache version 2.0 license
65+ can be found in `/usr/share/common-licenses/Apache-2.0'.
66+
67 License: MIT
68 Permission is hereby granted, free of charge, to any person obtaining a
69 copy of this software and associated documentation files (the
70@@ -38,10 +51,10 @@ License: MIT
71 tribute, sublicense, and/or sell copies of the Software, and to permit
72 persons to whom the Software is furnished to do so, subject to the fol-
73 lowing conditions:
74-
75+ .
76 The above copyright notice and this permission notice shall be included
77 in all copies or substantial portions of the Software.
78-
79+ .
80 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
81 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
82 ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT

Subscribers

People subscribed via source and target branches