[Python-modules-commits] [python-w3lib] 11/13: Restructure d/copyright to remove duplicate license texts and rename to BSD-3-clause.

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-w3lib.

commit a5d267f6fe7a59c190b471e5c0feb8f2fd84d1f8
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Jan 24 21:09:29 2017 +0100

    Restructure d/copyright to remove duplicate license texts and rename
    to BSD-3-clause.
---
 debian/changelog |  2 ++
 debian/copyright | 38 +++++++-------------------------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e55e33b..082264d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ python-w3lib (1.16.0-1) UNRELEASED; urgency=low
   * Remove version requirement from python-all for Build-Depends.
   * Reformat packaging files with cme for better readability.
   * Fix spelling error in long description.
+  * Restructure d/copyright to remove duplicate license texts and rename
+    to BSD-3-clause.
 
  -- Michael Fladischer <fladi at debian.org>  Tue, 24 Jan 2017 16:35:02 +0100
 
diff --git a/debian/copyright b/debian/copyright
index e84b329..daa423b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,39 +3,15 @@ Upstream-Name: w3lib
 Upstream-Contact: Scrapy project <info at scrapy.org>
 Source: http://pypi.python.org/pypi/w3lib
 
+Files: *
+Copyright: 2011, Scrapy project <info at scrapy.org>
+License: BSD-3-clause
+
 Files: debian/*
-Copyright:
-    2009-2012, Ignace Mouzannar <mouzannar at gmail.com>
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. Neither the name of Scrapy nor the names of its contributors may be used
-    to endorse or promote products derived from this software without
-    specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+Copyright: 2009-2012, Ignace Mouzannar <mouzannar at gmail.com>
+License: BSD-3-clause
 
-Files: *
-Copyright:
-    2011, Scrapy project <info at scrapy.org>
-License: BSD
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:

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