[Python-modules-commits] [python-fs] 14/17: Fix DEP-5 format in debian/copyright by moving BSD-3-Clause into separate section

Jan Dittberner jandd at moszumanska.debian.org
Sun Jan 3 19:30:06 UTC 2016


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

jandd pushed a commit to branch master
in repository python-fs.

commit 069547ede8b4750b92fdaac18d9a43d153869ac4
Author: Jan Dittberner <jandd at debian.org>
Date:   Sun Jan 3 19:44:59 2016 +0100

    Fix DEP-5 format in debian/copyright by moving BSD-3-Clause into separate section
---
 debian/changelog |  2 ++
 debian/copyright | 25 ++-----------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f4055a..af797a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ python-fs (0.5.4-1) UNRELEASED; urgency=medium
   * remove debian/python-fs.install and use PYBUILD_BEFORE_INSTALL
     instead
   * Update debian/copyright because fs/davfs is in fs/contrib/davfs now
+  * Fix DEP-5 format in debian/copyright by moving BSD-3-Clause into separate
+    section
 
  -- Jan Dittberner <jandd at debian.org>  Sun, 03 Jan 2016 18:21:51 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 78e57b1..3fbbbdc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,29 +6,6 @@ Source: http://pypi.python.org/pypi/fs/
 Files: *
 Copyright: 2009-2015, Will McGugan <will at willmcgugan.com> and contributors
 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:
- 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 the PyFilesystem nor the names of his contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
 
 Files: fs/expose/fuse/fuse_ctypes.py
 Copyright: 2008 Giorgos Verigakis <verigak at gmail.com>
@@ -61,6 +38,8 @@ License: MIT
 Files: debian/*
 Copyright: 2014 Janos Guljas <janos at debian.org>
 License: BSD-3-clause
+
+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-fs.git



More information about the Python-modules-commits mailing list