Fixed debian/copyright order, holders and years.

Rewritten-From: b49f74bb0d2c5eb85b5dfb6ed84fdd596a412a39

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 32f6a33538397ea3517488bb135a4dc02212af47..7b231522e8452317bd95e25573048cc11855b596 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -2,6 +2,8 @@ neutron-lbaas (1:7.0.0-1) unstable; urgency=medium
 
   * New upstream release.
   * Uploading to unstable.
+  * Added git as build-depends.
+  * Fixed debian/copyright order, holders and years.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 22 Oct 2015 15:48:15 +0200
 

diff --git a/trusty/debian/control b/trusty/debian/control
index d05fb31dd7218234835461ea35d04ff09a0ebdb3..29f13fb31c45f4b18cc2b511e6bcdf8fbb8c7e7b 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 9),
                python-setuptools,
                python-sphinx,
 Build-Depends-Indep: alembic (>= 0.8.0),
+                     git,
                      python-barbicanclient (>= 3.3.0),
                      python-coverage,
                      python-eventlet (>= 0.17.4),

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index d73d826f572da958348432dcc654bf457b899543..9395ca8897697c2da09ecf7b3119c9ad898fd3aa 100644 (file)
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -2,13 +2,30 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Neutron LBaaS
 Source: git://github.com/openstack/neutron-lbaas.git
 
-Files: debian/*
-Copyright: 2012-2013, Thomas Goirand <zigo@debian.org>
+Files: *
+Copyright: (c) 2011-2016, The OpenStack Foundation
+           (c) 2013, IBM Corp.
+           (c) 2013-2015, Hewlett-Packard Development Company, L.P.
+           (c) 2014-2015, NEC Corporation
+           (c) 2014-2015, Rackspace, Inc.
+           (c) 2013, New Dream Network, LLC
+           (c) 2014, Red Hat, Inc.
+           (c) 2013, NTT Corporation
+           (c) 2013-2014, Mirantis, Inc.
+           (c) 2014-2015, A10 Networks
+           (c) 2015, VMware, Inc.
+           (c) 2014, Deutsche Telekom AG
+           (c) 2013-2015, Radware LTD.
+           (c) 2013-2014, Embrane, Inc.
+           (c) 2015, Shane McGough, KEMPtechnologies
+           (c) 2014, Brocade Communications Systems, Inc.
+           (c) 2014-2015, Citrix Systems
+           (c) 2010, US Government as represented by the Administrator of NASA
+           (c) 2014, Samsung Electronics
 License: Apache-2.0
 
-Files: *
-Copyright: (c) 2011-2012, OpenStack, LLC.
-           (c) 2013-2014, The OpenStack Foundation
+Files: debian/*
+Copyright: 2012-2016, Thomas Goirand <zigo@debian.org>
 License: Apache-2.0
 
 License: Apache-2.0