Fixed missing license in debian/copyright

Rewritten-From: 2791621450baabe75ea0b54f5a9daf995c86cf08

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 8c96a5e30ccc4c792c34c5cdb840e5a2ac32c7d0..d05e72f187f3b312468d3ce1fcbacd50cbfb4fd4 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -2,6 +2,7 @@ horizon (2012.1.1-3) unstable; urgency=low
 
   * Added missing (build-)dependencies (took what was in the Ubuntu package and
   which seems to be missing in Debian).
+  * Fixed missing license in debian/copyright.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 06 Jul 2012 18:03:53 +0000
 

diff --git a/xenial/debian/copyright b/xenial/debian/copyright
index 587be25e2f99b7eec12fdd213dea66c7aada02a4..0f4ba58436db3d352a77058b35d66077c899a049 100644 (file)
--- a/xenial/debian/copyright
+++ b/xenial/debian/copyright
@@ -7,24 +7,40 @@ Copyright: 2011 OpenStack LLC
            2011 Nebula, Inc
            2011 United States Government as represented by the Administrator
                 of the National Aeronautics and Space Administration
+           2011 Midokura KK
 License: Apache-2.0
 
 Files: debian/*
 Copyright: 2011 Julien Danjou <acid@debian.org>
 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.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
+ 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
  .
  Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations under
+ the License.
  .
- On Debian systems, the complete text of the Apache version 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
+ On Debian systems, the complete text of the Apache version 2.0 license can be
+ found in "/usr/share/common-licenses/Apache-2.0".