[Python-modules-commits] [python-gear] 05/06: Fixed debian/copyright.

[Thomas Goirand]

This is an automated email from the git hooks/post-receive script.

zigo pushed a commit to annotated tag debian/0.5.8-1
in repository python-gear.

commit 85ce57aa0471a2b8c5717bd9fb422c8012e6fd89
Author: Thomas Goirand <thomas at goirand.fr>
Date:   Tue Sep 8 09:25:36 2015 +0000

    Fixed debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 57 +++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36e4c65..b60d949 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ python-gear (0.5.8-1) unstable; urgency=medium
   * Better call unit test suite (directly with testr).
   * Fixed debian/gbp.conf
   * Switched to dh 9.
+  * Fixed debian/copyright.
 
  -- Thomas Goirand <zigo at debian.org>  Tue, 08 Sep 2015 09:11:03 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 3e3809a..3e0b93d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,18 +3,49 @@ Upstream-Name: gear
 Upstream-Contact: Openstack Infrastructure
 Source: https://review.openstack.org/p/openstack-infra/gear.git
 
+Files: debian/*
+Copyright: (c) 2013, Antoine Musso <amusso at free.fr>
+           (c) 2013, Wikimedia Foundation Inc.
+           (c) 2015, Thomas Goirand <zigo at debian.org>
+License: GPL-2-or-Apache-2.0
+
 Files: *
-Copyright: Copyright 2013 OpenStack Foundation
- Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-License: Apache-2.0
- On Debian systems, the full text of the Apache License version 2.0 can be
- found in the file `/usr/share/common-licenses/Apache-2.0'.
+Copyright: (c) 2013-2015, OpenStack Foundation
+           (c) 2013-2015, Hewlett-Packard Development Company, L.P.
+License: GPL-2-or-Apache-2.0
 
-Files: debian/*
-Copyright: Copyright 2013 Antoine Musso <amusso at free.fr>
- Copyright 2013 Wikimedia Foundation Inc.
-License: GPL-2 or Apache-2.0
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/Apache-2.0'.
- On Debian systems, the full text of the Apache License version 2.0 can be
- found in the file `/usr/share/common-licenses/Apache-2.0'.
+License: GPL-2-or-Apache-2.0
+ GPL-2 copyright notice:
+ .
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public License v2
+ (GPL) can be found in /usr/share/common-licenses/GPL-2.
+ .
+ Apache-2.0 copyright notice:
+ .
+ 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.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-gear.git