cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:zesty/fix-debian-copyright into cloud-init:ubuntu/zesty.

Commit message:
d/copyright: Add text of Apache 2.0

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

LP: #1718681

Requested reviews:
  cloud-init commiters (cloud-init-dev)
Related bugs:
  Bug #1718681 in cloud-init: "Package copyright file omits Apache 2 license"
  https://bugs.launchpad.net/cloud-init/+bug/1718681

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/331174
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~powersj/cloud-init:zesty/fix-debian-copyright into cloud-init:ubuntu/zesty.

diff --git a/debian/copyright b/debian/copyright
index cf4a76f..a135573 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,7 @@ Upstream Author: Scott Moser <smoser@xxxxxxxxxxxxx>
 
 Copyright: 2010, Canonical Ltd.
 License: GPL-3 or Apache-2.0
+License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 3, as
  published by the Free Software Foundation.
@@ -27,6 +28,21 @@ License: GPL-3 or Apache-2.0
 
  The complete text of the GPL version 3 can be seen in
  /usr/share/common-licenses/GPL-3.
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
 
 Files: cloudinit/boto_utils.py
 Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/