debian/copyright: dep5 updates, reorganize, add Apache 2.0 license.

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

Also cloud-init 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.

LP: #1718681

1 files changed, 31 insertions, 18 deletions

diff --git a/debian/copyright b/debian/copyright
index cf4a76f8..c2236702 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,48 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: cloud-init
-Maintainer: Scott Moser <scott.moser@canonical.com>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cloud-init
+Upstream-Contact: cloud-init-dev@lists.launchpad.net
 Source: https://launchpad.net/cloud-init
 
-This package was debianized by Soren Hansen <soren@ubuntu.com> on
-Thu, 04 Sep 2008 12:49:15 +0200 as ec2-init.  It was later renamed to
-cloud-utils by Scott Moser <scott.moser@canonical.com>
-
-Upstream Author: Scott Moser <smoser@canonical.com>
-    Soren Hansen <soren@canonical.com>
-    Chuck Short <chuck.short@canonical.com>
-
+Files: *
 Copyright: 2010, Canonical Ltd.
 License: GPL-3 or Apache-2.0
+
+Files: cloudinit/boto_utils.py
+Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/
+License: MIT
+
+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.
-
+ .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
-
+ .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+ .
  The complete text of the GPL version 3 can be seen in
  /usr/share/common-licenses/GPL-3.
 
-Files: cloudinit/boto_utils.py
-Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/
+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'.
+
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
@@ -38,10 +51,10 @@ License: MIT
  tribute, sublicense, and/or sell copies of the Software, and to permit
  persons to whom the Software is furnished to do so, subject to the fol-
  lowing conditions:
-
+ .
  The above copyright notice and this permission notice shall be included
  in all copies or substantial portions of the Software.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
  ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT