Skip to content

Commit

Permalink
Merge pull request #3 from remia/fix/license_bsd
Browse files Browse the repository at this point in the history
License is BSD not MIT
  • Loading branch information
remia authored Nov 24, 2017
2 parents a499683 + b06f66b commit 967d541
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
34 changes: 17 additions & 17 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
Copyright © 2017 YMAGIS S.A.
All rights reserved.
Copyright © 2017 YMAGIS S.A.

All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* 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.
* Neither the name of YMAGIS S.A., 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 YMAGIS S.A. AND CONTRIBUTORS ``AS IS''
are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* 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.
* Neither the name of YMAGIS S.A., 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 YMAGIS S.A. AND CONTRIBUTORS
Expand All @@ -25,4 +25,4 @@ 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.
THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion clairmeta/info.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

__license__ = 'MIT'
__license__ = 'BSD'
__author__ = 'Ymagis'
__version__ = '1.0.0b2'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
'Topic :: Multimedia :: Video',
'Topic :: Software Development :: Libraries :: Python Modules',

'License :: OSI Approved :: MIT License',
'License :: OSI Approved :: BSD License',

'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
Expand Down

0 comments on commit 967d541

Please sign in to comment.