[med-svn] [python-mne] 15/15: debian/copyright - MIT -> Expat, consistent -Clause for BSD, https url

[Yaroslav Halchenko]

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

yoh pushed a commit to branch master
in repository python-mne.

commit 148fcb5d6b3765bd3159d991167898fc5e3e5b3b
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Fri Nov 18 12:10:56 2016 -0500

    debian/copyright - MIT -> Expat, consistent -Clause for BSD, https url
---
 debian/changelog |  2 ++
 debian/control   |  2 +-
 debian/copyright | 32 ++++++++++++++++----------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f07517d..bb166db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-mne (0.13+git8-gcb8707f+dfsg-1) unstable; urgency=medium
   * Fresh upstream maint snapshot hopefully resolving issues with unicode
     - removed --exclude=test_add_slider_to_section
   * This time with +dfsg cleansing of .min.js files
+  * debian/copyright
+    - MIT -> Expat, consistent -Clause for BSD, https url
 
  -- Yaroslav Halchenko <debian at onerussian.com>  Fri, 18 Nov 2016 10:39:08 -0500
 
diff --git a/debian/control b/debian/control
index b5984de..1f3f916 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9),
                python-matplotlib,
                python-joblib (>= 0.4.5),
                python-sklearn,
-               mayavi2 (>= 4.4.3-1) | python-vtk6 | python-vtk,
+               mayavi2 (>= 4.4.3~) | python-vtk6 | python-vtk,
                xvfb,
                xauth,
                libgl1-mesa-dri,
diff --git a/debian/copyright b/debian/copyright
index add0938..bd1d219 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MNE-Python
 Upstream-Contact: Alexandre Gramfort <alexandre.gramfort at m4x.org>
 Source: http://github.com/mne-tools/mne-python
@@ -7,11 +7,11 @@ Comment: File AppEULA.rst refers to code that is documented in this package but
 
 Files: *
 Copyright: 2010-2016, MNE-Python Developers
-License: BSD-3
+License: BSD-3-Clause
 
 Files: doc/sphinxext/*
 Copyright: 2008, Stefan van der Walt <stefan at mentat.za.net>, Pauli Virtanen <pav at iki.fi>
-License: BSD-2
+License: BSD-2-Clause
   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
@@ -21,34 +21,34 @@ License: BSD-2
 
 Files: debian/*
 Copyright: 2010-2015, Yaroslav Halchenko <debian at onerussian.com>, Alexandre Gramfort <alexandre.gramfort at m4x.org>
-License: BSD-3
+License: BSD-3-Clause
 
 Files: mne/externals/decorator.py
 Copyright: 2005-2012, Michele Simionato
-License: BSD
+License: BSD-2-Clause
 
 Files: mne/externals/Fieldtrip.py
 Copyright: 2008, Robert Oostenveld, S. Klanke
   F.C. Donders Centre for Cognitive Neuroimaging,
   Radboud University Nijmegen, The Netherlands.
   http://www.ru.nl/fcdonders/fieldtrip
-License: BSD-3
+License: BSD-3-Clause
 
 Files: mne/externals/jdcal.py
 Copyright: 2010, Prasanth Nair, <prasanthhn at gmail.com>
-License: BSD
+License: BSD-2-Clause
 
 Files: mne/externals/six.py
 Copyright: 2010-2013 Benjamin Peterson
-License: MIT
+License: Expat
 
 Files: mne/externals/tempita/*
 Copyright: 2008 Ian Bicking and Contributors
-License: MIT
+License: Expat
 
 Files: debian/JS/bootstrap
 Copyright: 2011-2014 Twitter, Inc.
-License: MIT
+License: Expat
 
 Files: mne/html/bootstrap*
 Copyright: 2013 Twitter, Inc.
@@ -70,17 +70,17 @@ License: Apache
 
 Files: mne/html/jquery*
 Copyright: 2005, 2013 jQuery Foundation, Inc.
-License: MIT
+License: Expat
 
 Files: mne/html/d3*
 Copyright: 2013 Mike Bostock.
-License: BSD-3
+License: BSD-3-Clause
 
 Files: mne/html/mpld3*
 Copyright: 2013, Jake Vanderplas
-License: BSD-3
+License: BSD-3-Clause
 
-License: BSD
+License: BSD-2-Clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are
   met:
@@ -105,7 +105,7 @@ License: BSD
   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
   DAMAGE.
 
-License: BSD-3
+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:
   .
@@ -130,7 +130,7 @@ License: BSD-3
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: MIT
+License: Expat
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
   in the Software without restriction, including without limitation the rights

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git