Merge branch 'release-0.3.6'0.3.6

3 files changed, 10 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 796e025..52c7ba7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.3.6 Dec 6:
+  o Update some documentation and packaging bits.
+
 0.3.5 Nov 1:
   o Move get_email_charset to this module.
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 9fb5300..cad7096 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,3 +4,4 @@ include src/leap/common/cacert.pem
 include versioneer.py
 include LICENSE
 include CHANGELOG
+include README.rst
diff --git a/setup.py b/setup.py
index 519ddb3..264d04c 100644
--- a/setup.py
+++ b/setup.py
@@ -104,6 +104,11 @@ def get_versions(default={}, verbose=False):
         with open(versioneer.versionfile_source, 'w') as f:
             f.write(subst_template)
 
+try:
+    long_description = open('README.rst').read() + '\n\n\n' + \
+        open('CHANGELOG').read()
+except Exception:
+    long_description = ""
 
 cmdclass["freeze_debianver"] = freeze_debianver
 setup(
@@ -118,8 +123,7 @@ setup(
     maintainer='Kali Kaneko',
     maintainer_email='kali@leap.se',
     description='Common files used by the LEAP project.',
-    long_description=open('README.rst').read() + '\n\n\n' +
-    open('CHANGELOG').read(),
+    long_description=long_description,
     classifiers=trove_classifiers,
     namespace_packages=["leap"],
     package_dir={'': 'src'},