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 --- LICENSE | 14 -------------- LICENSE.rst | 19 +++++++++++++++++++ README.rst | 20 -------------------- setup.py | 1 + 4 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.rst diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 88f69aa..0000000 --- a/LICENSE +++ /dev/null @@ -1,14 +0,0 @@ -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. - -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 . diff --git a/LICENSE.rst b/LICENSE.rst new file mode 100644 index 0000000..c45726b --- /dev/null +++ b/LICENSE.rst @@ -0,0 +1,19 @@ +License +------- + +GPL License. :: + +Copyright (C) 2011 Jon Bernard and contributers + +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. + +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 . diff --git a/README.rst b/README.rst index 0509f1f..d73beae 100644 --- a/README.rst +++ b/README.rst @@ -131,26 +131,6 @@ I have the following in my ``~/.dotfilesrc``: :: Any file you list in ``ignore`` will be skipped. The ``ignore`` option supports glob file patterns. -License -------- - -GPL License. :: - - 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. - - 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 . - Contribute ---------- 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