* Removed reference and license for tools/rfc.sh which doesn't exist, in

    debian/copyright.

Rewritten-From: fb088fce60c898238822c622e9d0c22c2ec78fae

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 5432f56a097fed5f62f957ae9a065aa589062f0f..e9c55032c50e684352ccbbbc33fd63fe7b633e72 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -4,6 +4,8 @@ neutron (2014.2~rc1-1) experimental; urgency=medium
   * Now using templated init script for sysv-rc, generated systemd unit and
     upstart jobs, using openstack-pkg-tools >= 13.
   * Refreshed/rebased/reworked fix-alembic-migration-with-sqlite3.patch.
+  * Removed reference and license for tools/rfc.sh which doesn't exist, in
+    debian/copyright.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 03 Oct 2014 18:53:11 +0800
 

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index 6f52bfd18ff5702d6eec2c4e90f8d45350ba96c9..1f001462b8212c6fa751390363fb985e6e583ed1 100644 (file)
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -8,32 +8,16 @@ Copyright: 2012-2013, Thomas Goirand <zigo@debian.org>
        (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
+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
 
-
-Files: tools/rfc.sh
-Copyright: Copyright (c) 2010-2011 Gluster, Inc
-License: GPL-v3
-
-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'
-
-License: Apache-2
+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