X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fcopyright;h=1f001462b8212c6fa751390363fb985e6e583ed1;hb=a5a14ee1bb1db18e5400c8e785a96909a325a1c3;hp=b0fafc35f92293a64b7f2c4324461ffda8df8439;hpb=3650bade146bf59a7828feda89ddb602dfea6047;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index b0fafc35f..1f001462b 100644
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -1,18 +1,28 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: neutron
-Source: http://github.com/openstack/neutron
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Neutron
+Source: git://github.com/openstack/neutron.git
+
+Files: debian/*
+Copyright: 2012-2013, Thomas Goirand <zigo@debian.org>
+	(c) 2012, Mehdi Abaakouk <sileht@sileht.net>
+	(c) 2011-2012, Ghe Rivero <ghe.rivero@stackops.com>
+	(c) 2012, Loic Dachary (OuoU) <loic@debian.org>
+	(c) 2012, Ola Lundqvist <opal@debian.org>
+License: Apache-2.0
 
 Files: *
 Copyright: 2011 OpenStack, LLC.
 		   2011 Cisco Systems
 		   2011 Nicira Networks
            2011 Citrix Systems
-License: Apache-2
+License: Apache-2.0
+
+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
+     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,
@@ -21,17 +31,4 @@ License: Apache-2
  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: tools/rfc.sh
-Copyright: Copyright (c) 2010-2011 Gluster, Inc
-License: GPL-v3
-                     GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
- .
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
- .
- On Debian-based systems the full text of the Apache version 2.0 license
- can be found in `/usr/share/common-licenses/GPL-3'
+ can be found in `/usr/share/common-licenses/Apache-2.0'.