Switch to ISC license

5 files changed, 18 insertions, 18 deletions

diff --git a/LICENSE.rst b/LICENSE.rst
index c45726b..0958440 100644
--- a/LICENSE.rst
+++ b/LICENSE.rst
@@ -1,19 +1,18 @@
 License
 -------
 
-GPL License. ::
+ISC License. ::
 
-Copyright (C) 2011  Jon Bernard and contributers
+Copyright (c) 2011, Jon Bernard <jbernard@tuxion.com>
 
-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 3 of the License, or
-(at your option) any later version.
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-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, see <http://www.gnu.org/licenses/>.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/MANIFEST.in b/MANIFEST.in
index ec3e59e..e13c266 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include HISTORY.rst README.rst LICENSE AUTHORS.rst
+include HISTORY.rst README.rst LICENSE.rst AUTHORS.rst
diff --git a/dotfiles/cli.py b/dotfiles/cli.py
index 3441e75..192144f 100644
--- a/dotfiles/cli.py
+++ b/dotfiles/cli.py
@@ -196,6 +196,7 @@ def check_repository_exists():
             missing_default_repo()
         exit(-1)
 
+
 def update_settings(opts, key):
     global settings
 
diff --git a/dotfiles/core.py b/dotfiles/core.py
index f6c68c1..3c13280 100644
--- a/dotfiles/core.py
+++ b/dotfiles/core.py
@@ -13,8 +13,8 @@ import fnmatch
 
 
 __version__ = '0.4.4'
-__author__ = "Jon Bernard"
-__license__ = "GPL"
+__author__ = 'Jon Bernard'
+__license__ = 'ISC'
 
 
 class Dotfile(object):
diff --git a/setup.py b/setup.py
index 098e351..29763a3 100755
--- a/setup.py
+++ b/setup.py
@@ -32,12 +32,12 @@ setup(name='dotfiles',
       author_email='jbernard@tuxion.com',
       url='https://github.com/jbernard/dotfiles',
       packages=['dotfiles'],
-      license='GPL',
+      license='ISC',
       classifiers=(
           'Development Status :: 4 - Beta',
           'Environment :: Console',
           'Intended Audience :: Developers',
-          'License :: OSI Approved :: GNU General Public License (GPL)',
+          'License :: OSI Approved :: ISC License (ISCL)'
           'Natural Language :: English',
           'Programming Language :: Python',
       ),