From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 20 Jan 2016 13:29:00 +0000 (+0000)
Subject: Fixed debian/copyright
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=78cc1a9c15119229062beb4c73f6a4648a372d78;p=openstack-build%2Fneutron-build.git

Fixed debian/copyright

Rewritten-From: 7ef3a48c06585880626e894f28c232dbae90e084
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index b7efa1f5c..2beb01c26 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -8,6 +8,7 @@ neutron (1:8.0.0~b2-1) experimental; urgency=medium
   * Using oslo-config-generator to generate config files, as upstream moved to
     use that as well.
   * export OSLO_PACKAGE_VERSION now compatible with Trusty version of dpkg.
+  * Fixed debian/copyright.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 04 Dec 2015 09:03:42 +0100
 
diff --git a/xenial/debian/copyright b/xenial/debian/copyright
index 1f001462b..faf7b38c1 100644
--- a/xenial/debian/copyright
+++ b/xenial/debian/copyright
@@ -2,19 +2,44 @@ 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>
+Files: *
+Copyright: (c) 2011-2016, OpenStack Foundation <openstack-dev@lists.openstack.org>
+           (c) 2011-2016, Cisco Systems
+           (c) 2011-2016, Nicira Networks
+           (c) 2011-2016, Citrix Systems
+           (c) 2012-2016, Hewlett-Packard Development Company, L.P.
+           (c) 2011-2016, VMware, Inc
+           (c) 2012, Nachi Ueno, NTT MCL, Inc.
+           (c) 2012-2016, Intel Corporation
+           (c) 2012-2016, Mirantis Inc.
+           (c) 2013-2016, Red Hat, Inc.
+           (c) 2013-2016, IBM Corp.
+           (c) 2014-2016, VA Linux Systems Japan K.K.
+           (c) 2014-2015, Thales Services SAS
+           (c) 2014-2015, Deutsche Telekom AG
+           (c) 2014-2015, SUSE Linux Products GmbH
+           (c) 2013-2015, NEC Corporation
+           (c) 2011-2015, VMware, Inc.
+           (c) 2012-2015, Cisco Systems, Inc.
+           (c) 2013, Huawei Technologies Co.,LTD.
+           (c) 2012-2015, New Dream Network, LLC (DreamHost)
+           (c) 2014-2015, Mellanox Technologies, Ltd
+           (c) 2013-2015, eNovance SAS <licensing@enovance.com>
+           (c) 2013-2015, Rackspace, Inc.
+           (c) 2015, Infoblox Inc.
+           (c) 2015, Cloudbase Solutions.
+           (c) 2015, Infoblox Inc.
+           (c) 2015, Taturiello Consulting, Meh.
+           (c) 2001-2010, Twisted Matrix Laboratories.
+           (c) 2012, Locaweb.
 License: Apache-2.0
 
-Files: *
-Copyright: 2011 OpenStack, LLC.
-		   2011 Cisco Systems
-		   2011 Nicira Networks
-           2011 Citrix Systems
+Files: debian/*
+Copyright: (c) 2012-2016, 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
 
 License: Apache-2.0