merge from the debian-unstable tree

1 files changed, 10 insertions, 3 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8f71e3e3..40154a6f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,9 +23,13 @@ import sys
 # absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
 sys.path.insert(0, os.path.abspath('../..'))
+
+# Find the path to the built apt_pkg and apt_inst extensions
 if os.path.exists("../../build"):
+    version = '.'.join(str(x) for x in sys.version_info[:2])
     for dirname in os.listdir('../../build'):
-        sys.path.insert(0, os.path.abspath('../../build/' + dirname))
+        if version in dirname:
+            sys.path.insert(0, os.path.abspath('../../build/' + dirname))
 
 # General configuration
 # ---------------------
@@ -56,10 +60,13 @@ copyright = u'2009, Julian Andres Klode <jak@debian.org>'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+from debian_bundle.changelog import Changelog
+
+changes = Changelog(open('../../debian/changelog'))
 # The short X.Y version.
-version = '0.7'
+version = '.'.join(changes.full_version.split('.')[:2])
 # The full version, including alpha/beta/rc tags.
-release = '0.7.9~exp2'
+release = changes.full_version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.