Update after bug:1515255

[openstack-build/cinder-build.git] / trusty / debian / copyright

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index 2902979fb0cce7c2a16eb9e17efdd47d523c1cf0..423124d0360cb89cdf6d21d24157528a6b60f4d2 100644 (file)
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -1,22 +1,13 @@
-Format: http://dep.debian.net/deps/dep5-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cinder
 Source: git://github.com/openstack/cinder.git
 
-Files: debian/*
-Copyright: 2011-2013, Thomas Goirand <zigo@debian.org>
-          2014, Vasyl Saienko <vsaienko@mirantis.com>
-          2014, Maksym Yatsenko <myatsenko@mirantis.com>
-           2015, Mikhail Ivanov <mivanov@mirantis.com>
-License: Apache-2
-
 Files: *
-Copyright: 2010 United States Government as represented
+Copyright: (c) 2010 United States Government as represented
                 by the Administrator of the National Aeronautics
                 and Space Administration.
-          2010 OpenStack LLC
-               Others (See individual files for more details)
-License: Apache-2
-
+       (c) 2010 OpenStack LLC
+       (c) Others (See individual files for more details)
 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.