Build-Depend on python-debian, use it to get version number from changelog

4 files changed, 38 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index f996ef5b..3f7b420d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-apt (0.7.10~exp1) experimental; urgency=low
+
+  * Build-Depend on python-debian, use it to get version number from changelog
+
+ -- Julian Andres Klode <jak@debian.org>  Sun, 29 Mar 2009 14:09:18 +0200
+
 python-apt (0.7.9) unstable; urgency=low
 
   [ Julian Andres Klode ]
diff --git a/debian/control b/debian/control
index 41e3af4a..932a2b4f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,16 @@ Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 Standards-Version: 3.7.2.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.10), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.5), python-all-dbg, python-sphinx (>= 0.5)
+Build-Depends: apt-utils,
+               cdbs,
+               debhelper (>= 5.0.37.1),
+               libapt-pkg-dev (>= 0.7.10),
+               python-all-dbg,
+               python-all-dev,
+               python-central (>= 0.5),
+               python-debian,
+               python-distutils-extra (>= 1.9.0),
+               python-sphinx (>= 0.5)
 Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
 Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3b0ebed7..17fe6a23 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -56,10 +56,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~exp3'
+release = changes.full_version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index fc046381..1c266ce7 100755
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,26 @@
 #! /usr/bin/env python
 # $Id: setup.py,v 1.2 2002/01/08 07:13:21 jgg Exp $
-
-from distutils.core import setup, Extension
-from distutils.sysconfig import parse_makefile
-from DistUtilsExtra.command import build_extra, build_i18n
 import glob
 import os
 import shutil
 import sys
 
+from distutils.core import setup, Extension
+from distutils.sysconfig import parse_makefile
+from DistUtilsExtra.command import build_extra, build_i18n
+
+
+class FakeDebianSupportModule(object):
+    """Work around the python-apt dependency of debian_support."""
+
+    class Version(object):
+        """Empty class."""
+
+sys.modules['debian_bundle.debian_support'] = FakeDebianSupportModule
+
+from debian_bundle.changelog import Changelog
+
+
 
 # The apt_pkg module
 files = map(lambda source: "python/"+source,
@@ -46,7 +58,7 @@ if len(sys.argv) > 1 and sys.argv[1] == "clean" and '-a' in sys.argv:
             print "Not removing", dirname, "because it does not exist"
 
 setup(name="python-apt",
-      version="0.7.9",
+      version=Changelog(open('debian/changelog')).full_version,
       description="Python bindings for APT",
       author="APT Development Team",
       author_email="deity@lists.debian.org",