From e1e829cfb9eeca5c8675c1fecaead1288f748199 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 4 Oct 2014 07:20:44 +0000 Subject: [PATCH] * Removed reference and license for tools/rfc.sh which doesn't exist, in debian/copyright. Rewritten-From: fb088fce60c898238822c622e9d0c22c2ec78fae --- xenial/debian/changelog | 2 ++ xenial/debian/copyright | 22 +++------------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 5432f56a0..e9c55032c 100644 --- a/xenial/debian/changelog +++ b/xenial/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 Fri, 03 Oct 2014 18:53:11 +0800 diff --git a/xenial/debian/copyright b/xenial/debian/copyright index 6f52bfd18..1f001462b 100644 --- a/xenial/debian/copyright +++ b/xenial/debian/copyright @@ -8,32 +8,16 @@ Copyright: 2012-2013, Thomas Goirand (c) 2011-2012, Ghe Rivero (c) 2012, Loic Dachary (OuoU) (c) 2012, Ola Lundqvist -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. - 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 -- 2.45.2