summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jon Bernard <jbernard@tuxion.com> 2011-10-30 23:15:26 -0400
committerGravatar Jon Bernard <jbernard@tuxion.com> 2011-10-30 23:19:51 -0400
commit24d933cd733bcc89375bc43b56eb37a559e9144c (patch)
treee827019cb5c13355cc6e0ee60cebc6d72d5c07f5
parentfe87378a3a274e685e72224204660648d0afd6bd (diff)
downloaddotfiles-24d933cd733bcc89375bc43b56eb37a559e9144c.tar.gz
dotfiles-24d933cd733bcc89375bc43b56eb37a559e9144c.tar.bz2
dotfiles-24d933cd733bcc89375bc43b56eb37a559e9144c.zip
Import license content instead of duplicating it
-rw-r--r--LICENSE.rst (renamed from LICENSE)7
-rw-r--r--README.rst20
-rwxr-xr-xsetup.py1
3 files changed, 7 insertions, 21 deletions
diff --git a/LICENSE b/LICENSE.rst
index 88f69aa..c45726b 100644
--- a/LICENSE
+++ b/LICENSE.rst
@@ -1,4 +1,9 @@
-Copyright (C) 2011 Jon Bernard <jbernard@tuxion.com>
+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
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 <http://www.gnu.org/licenses/>.
-
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',