From 24d933cd733bcc89375bc43b56eb37a559e9144c Mon Sep 17 00:00:00 2001 From: Jon Bernard Date: Sun, 30 Oct 2011 23:15:26 -0400 Subject: Import license content instead of duplicating it --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e11410b..098e351 100755 --- a/setup.py +++ b/setup.py @@ -26,6 +26,7 @@ setup(name='dotfiles', version=__version__, description='Easily manage your dotfiles', long_description=open('README.rst').read() + '\n\n' + + open('LICENSE.rst').read() + '\n\n' + open('HISTORY.rst').read(), author='Jon Bernard', author_email='jbernard@tuxion.com', -- cgit v1.2.3 From 7b0ea7b095736ce6b95ec2dbbdd73dc03f36136c Mon Sep 17 00:00:00 2001 From: Jon Bernard Date: Tue, 1 Nov 2011 12:43:33 -0400 Subject: Switch to ISC license --- LICENSE.rst | 25 ++++++++++++------------- MANIFEST.in | 2 +- dotfiles/cli.py | 1 + dotfiles/core.py | 4 ++-- setup.py | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'setup.py') 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 -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 . +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', ), -- cgit v1.2.3