From 74c2449d8f0fe4e6ae8c237835b438f87dfc9aad Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 14:27:26 +0000
Subject: [PATCH 1/2] add version information in __init__.py and import them
 from setup.py and conf.py

---
 docs/conf.py        | 6 ++++--
 pelican/__init__.py | 4 +++-
 setup.py            | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 6c4e1ce5..ac2d67ee 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -3,6 +3,8 @@ import sys, os
 
 sys.path.append(os.path.abspath('..'))
 
+from pelican import __version__, __major__
+
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
 extensions = ['sphinx.ext.autodoc',]
@@ -11,8 +13,8 @@ master_doc = 'index'
 project = u'Pelican'
 copyright = u'2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-version = "2"
-release = version
+version = __version__
+release = __major__
 
 # -- Options for HTML output ---------------------------------------------------
 
diff --git a/pelican/__init__.py b/pelican/__init__.py
index 5ffcc3b5..780938a7 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -11,7 +11,9 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-__version__ = "3.0"
+__major__ = 3
+__minor__ = 0
+__version__ = "{0}.{1}".format(__major__, __minor__)
 
 
 class Pelican(object):
diff --git a/setup.py b/setup.py
index 910499de..d26ad5f4 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-VERSION = "3.0" # find a better way to do so.
+from pelican import __version__
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 
@@ -21,7 +21,7 @@ entry_points = {
 
 setup(
     name = "pelican",
-    version = VERSION,
+    version = __version__,
     url = 'http://pelican.notmyidea.org/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',

From df8b71f8110566351db3fdc358fcf8ff65d6bdcf Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Fri, 16 Mar 2012 14:27:51 +0000
Subject: [PATCH 2/2] remove unused *bat include

---
 MANIFEST.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index fc46d905..a092ecd0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,3 @@ include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png
 include LICENSE
-global-include *.bat