diff --git a/debian/changelog b/debian/changelog index 4fb53f56..802e8189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ glance (1:12.0.0~b2-1) experimental; urgency=medium upstream entry-points. * glance-api depends on adduser to avoid a lintian warning. * Update namespaces for config file generation. + * Fixed debian/copyright ordering and years. -- Thomas Goirand Tue, 08 Dec 2015 09:26:10 +0100 diff --git a/debian/copyright b/debian/copyright index 0a816076..c528d88c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,21 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: glance Source: https://github.com/openstack/glance -Files: debian/* -Copyright: (c) 2010-2013, Thomas Goirand - (c) 2012, Mehdi Abaakouk - (c) 2011-2012, Ghe Rivero - (c) 2012, Ola Lundqvist - (c) 2011, Julien Danjou - (c) 2011, Chuck Short - (c) 2011, Soren Hansen - (c) 2011, Canonical -License: Apache-2 - Files: * -Copyright: 2010 United States Government as represented by the Administrator of - the National Aeronautics and Space Administration. - 2010-2011 OpenStack LLC +Copyright: (c) 2010, US Government as represented by the Administrator of NASA + (c) 2010-2016, OpenStack Foundation Jay Pipes Brian Waldon Rick Harris @@ -141,6 +129,17 @@ Copyright: 2010 United States Government as represented by the Administrator of Alessandro Pilotti License: Apache-2 +Files: debian/* +Copyright: (c) 2010-2016, Thomas Goirand + (c) 2012, Mehdi Abaakouk + (c) 2011-2012, Ghe Rivero + (c) 2012, Ola Lundqvist + (c) 2011, Julien Danjou + (c) 2011, Chuck Short + (c) 2011, Soren Hansen + (c) 2011, Canonical +License: Apache-2 + License: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.