Merge branch 'debian-0.3.6' into debian

6 files changed, 26 insertions, 4 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/deb_release.sh b/deb_release.sh
new file mode 100755
index 0000000..9f0e675
--- /dev/null
+++ b/deb_release.sh
@@ -0,0 +1,8 @@
+#!/bin/zsh
+
+VERSION_FILE="src/leap/common/_version.py"
+rm ${VERSION_FILE}
+python setup.py freeze_debianver
+sed -i 's/-dirty//g' ${VERSION_FILE}
+git add ${VERSION_FILE}
+git ci -m "freeze debian version"	
diff --git a/debian/changelog b/debian/changelog
index ee8eb58..20f06a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+leap-common (0.3.6) unstable; urgency=low
+
+  * Update to 0.3.6 release
+
+ -- Micah Anderson <micah@debian.org>  Tue, 10 Dec 2013 16:02:51 -0400
+
 leap-common (0.3.5) unstable; urgency=low
 
   * Update to 0.3.5 release.
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'},
diff --git a/src/leap/common/_version.py b/src/leap/common/_version.py
index 940759b..acaa91d 100644
--- a/src/leap/common/_version.py
+++ b/src/leap/common/_version.py
@@ -5,8 +5,8 @@
 # unpacked source archive. Distribution tarballs contain a pre-generated copy
 # of this file.
 
-version_version = '0.3.5'
-version_full = 'fac6becd50e2f8bb9efc354fa63c65f2c1445ecc'
+version_version = '0.3.6'
+version_full = '3ea9dd9c8658f9faafd1f1a9a8c8ce16e6579f4a'
 
 
 def get_versions(default={}, verbose=False):