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

Proposed by Joshua Powers on 2017-09-21
Status: Merged
Approved by: Scott Moser on 2017-09-29
Approved revision: b7cb83b25458a6aa89d178b16fc3601a1e9992de
Merged at revision: 02b6994803bc3538964f7cbc8083cf8dd4e173e2
Proposed branch: ~powersj/cloud-init:devel/fix-debian-copyright
Merge into: cloud-init:ubuntu/devel
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
Steve Langasek 2017-09-25 Pending
Review via email: mp+331172@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:9b26debc236bb99ba90243d9dc5be97123986f96
https://jenkins.ubuntu.com/server/job/cloud-init-ci/343/
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/343/rebuild

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

I don't think we want to change the License: field, just add the 2.0 text

review: Needs Fixing
Scott Moser (smoser) wrote :

Hi, comment 'b' below I'm asking Steve for insight on
I have a few questions here. Things that were broken or unclear before, but we might as well fix.

a.) 'Files:' is required now. So lets add a 'Files: *'

b.) Lets fix the 'Format' line:
- Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

c.) Are we supposed to have an empty line between 'Licence' fields?
Josh has no empty line, but the specification in examples has one.

d.) Should the 'License:' sections be at the bottom or in order?

Then, lets just get all 4 relevant 'copyright' files to have the same content.
  ubuntu/xenial:debian/copyright
  ubuntu/zesty:debian/copyright
  ubuntu/devel:debian/copyright
  master:packages/debian/copyright

Steve Langasek (vorlon) wrote :

> I don't think we want to change the License: field, just add the 2.0 text

Generally you do want to specify the version as part of the license field, same as is done for GPL, as this assists with automated analysis.

> b.) Lets fix the 'Format' line:
> - Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
> + Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

Is this the bit you wanted my insight on? The new declaration is the current one that you want here, yes.

Joshua Powers (powersj) wrote :

@vorlon @smoser

Does this look right:
https://paste.ubuntu.com/25628692/

* Updated format
* Added "Files: *"
* Added blank lines between licenses
* Added line continuation in license text (e.g. ' .')

Joshua Powers (powersj) wrote :

I wasn't sure if I should put all three license's text at the bottom

Steve Langasek (vorlon) wrote :

On Wed, Sep 27, 2017 at 06:59:21PM -0000, Joshua Powers wrote:
> @vorlon @smoser

> Does this look right:
> https://paste.ubuntu.com/25628692/

> * Updated format
> * Added "Files: *"
> * Added blank lines between licenses
> * Added line continuation in license text (e.g. ' .')

This does not parse in dep5:

  This package was debianized by Soren Hansen <email address hidden> on
  Thu, 04 Sep 2008 12:49:15 +0200 as ec2-init. It was later renamed to
  cloud-utils by Scott Moser <email address hidden>

  Upstream Author: Scott Moser <email address hidden>
      Soren Hansen <email address hidden>
      Chuck Short <email address hidden>

IMHO putting the license: stanzas together at the bottom is more readable,
but there's no requirement in the standard that you do so.

And lintian should give you feedback about any syntax errors, if I'm not
mistaken.

Scott Moser (smoser) wrote :

lintian doesn't complain at all about the debian/copyright.
Steve can you give a quick look at
http://paste.ubuntu.com/25633185/

Changes versus Josh's last are:
  http://paste.ubuntu.com/25633193/

a84eb25... by Joshua Powers on 2017-09-28

copyright

b7cb83b... by Joshua Powers on 2017-09-28

maintainer

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

review: Approve (continuous-integration)
Steve Langasek (vorlon) wrote :

On Thu, Sep 28, 2017 at 01:01:36PM -0000, Scott Moser wrote:
> lintian doesn't complain at all about the debian/copyright.
> Steve can you give a quick look at
> http://paste.ubuntu.com/25633185/

LGTM.

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