From b0a017dec42bad6965b12d2921167b9e5bbaa72d Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel.ebert@upf.edu>
Date: Tue, 17 Apr 2012 11:17:48 +0200
Subject: [PATCH] Fixes setup.py

---
 CHANGELOG.md |  5 ++++-
 setup.py     | 51 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84dbfc10..b20d02f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+### 0.2.1
+
+* Submitted to [PyPi](http://pypi.python.org/pypi/jrnl/0.2.1).
+
 ### 0.2.0
 
 * Encrypts using CBC
@@ -10,7 +14,6 @@ Changelog
 
 * Removed unnecessary print commands
 * Created the documentation
-* Registered jrnl in the python package repository
 
 ###  0.1.0
 
diff --git a/setup.py b/setup.py
index 4227c6e6..1c465bb3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,26 +1,55 @@
+"""
+jrnl is a simple journal application for your command line. Journals are stored as human readable plain text files - you can put them into a Dropbox folder for instant syncinc and you can be assured that your journal will still be readable in 2050, when all your fancy iPad journal applications will long be forgotten.
+
+Optionally, your journal can be encrypted using 256-bit AES.
+
+Why keep a journal?
+```````````````````
+
+Journals aren't only for 13-year old girls and people who have too much time on their summer vacation. A journal helps you to keep track of the things you get done and how you did them. Your imagination may be limitless, but your memory isn't. For personal use, make it a good habit to write at least 20 words a day. Just to reflect what made this day special, why you haven't wasted it. For professional use, consider a text-based journal to be the perfect complement to your GTD todo list - a documentation of what and how you've done it.
+
+In a Nutshell
+`````````````
+
+to make a new entry, just type
+
+::
+
+    jrnl yesterday: Called in sick. Used the time to clean the house and spent 4h on writing my book.
+
+and hit return. yesterday` will be interpreted as a timestamp. Everything until the first sentence mark (.?!) will be interpreted as the title, the rest as the body. In your journal file, the result will look like this:
+
+::
+
+    2012-03-29 09:00 Called in sick. 
+    Used the time to clean the house and spent 4h on writing my book.
+
+If you just call jrnl you will be prompted to compose your entry - but you can also configure jrnl to use your external editor.
+
+Links
+`````
+
+* `website & documentation <http://maebert.github.com/jrnl>`_
+* `GitHub Repo <https://github.com/maebert/jrnl>`_
+
+"""
+
 from setuptools import setup, find_packages
 import os.path
 import sys
 
-install_requires = ["parsedatetime", "pycrypto", "hashlib"]
-if sys.version_info < (2, 6):
-    install_requires.append("simplejson")
-
 base_dir = os.path.dirname(os.path.abspath(__file__))
 
 setup(
     name = "jrnl",
-    version = "0.2.0",
+    version = "0.2.1",
     description = "A command line journal application that stores your journal in a plain text file",
 
     packages = find_packages(),
     scripts = ['jrnl.py'],
-    install_requires = install_requires,
-
-    long_description="\n".join([
-        open(os.path.join(base_dir, "README.md"), "r").read(),
-        open(os.path.join(base_dir, "CHANGELOG.md"), "r").read()
-    ]),
+    install_requires = ["parsedatetime", "pycrypto", "hashlib", "simplejson"],
+    package_data={'': ['*.md']},
+    long_description=__doc__,
     classifiers=[
         'Development Status :: 4 - Beta',
         'Development Status :: 4 - Beta',