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

Proposed by Joshua Powers on 2017-09-21
Status: Merged
Approved by: Scott Moser on 2017-09-29
Approved revision: 29f4422ea117421f21b691037e67c40ec3023439
Merged at revision: a88768a6048d96c2531ae01789735e0b7ef099ee
Proposed branch: ~powersj/cloud-init:zesty/fix-debian-copyright
Merge into: cloud-init:ubuntu/zesty
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+331174@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:4b698954ccd18bc5fdf96823fbc1e6e1fcf40b37
https://jenkins.ubuntu.com/server/job/cloud-init-ci/344/
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/344/rebuild

review: Approve (continuous-integration)
Ryan Harper (raharper) wrote :

Drop the change to the License: field, this patch should just be adding the apache 2.0 text, right?

review: Needs Fixing
29f4422... by Joshua Powers on 2017-09-28

push licences to end, line continue, headers.

PASSED: Continuous integration, rev:29f4422ea117421f21b691037e67c40ec3023439
https://jenkins.ubuntu.com/server/job/cloud-init-ci/358/
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/358/rebuild

review: Approve (continuous-integration)

Preview Diff

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

Subscribers

People subscribed via source and target branches