[telepathy-python/master] Be sure to set the correct version numbers when not released.

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 configure.ac       |    2 ++
 src/_version.py.in |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6da032f..99c17d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,8 @@ AC_DEFINE(TELEPATHY_PYTHON_MINOR_VERSION, telepathy_python_minor_version, [telep
 AC_SUBST(TELEPATHY_PYTHON_MINOR_VERSION, telepathy_python_minor_version)
 AC_DEFINE(TELEPATHY_PYTHON_MICRO_VERSION, telepathy_python_micro_version, [telepathy-python micro version])
 AC_SUBST(TELEPATHY_PYTHON_MICRO_VERSION, telepathy_python_micro_version)
+AC_DEFINE(TELEPATHY_PYTHON_RELEASED, telepathy_python_released, [telepathy-python released])
+AC_SUBST(TELEPATHY_PYTHON_RELEASED, telepathy_python_released)
 
 AM_PATH_PYTHON(2.4.0)
 
diff --git a/src/_version.py.in b/src/_version.py.in
index 5567ba6..6a70f1f 100644
--- a/src/_version.py.in
+++ b/src/_version.py.in
@@ -2,4 +2,9 @@ __all__ = ('version', '__version__')
 
 # @configure_input@
 version = (@TELEPATHY_PYTHON_MAJOR_VERSION@, @TELEPATHY_PYTHON_MINOR_VERSION@, @TELEPATHY_PYTHON_MICRO_VERSION@)
-__version__ = "@TELEPATHY_PYTHON_MAJOR_VERSION at .@TELEPATHY_PYTHON_MINOR_VERSION at .@TELEPATHY_PYTHON_MICRO_VERSION@"
+
+# Append a 1 to the version string only if this is *not* a released version.
+if not @TELEPATHY_PYTHON_RELEASED@:
+    version += (1,)
+
+__version__ = '.'.join(str(x) for x in version)
-- 
1.5.6.5