summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--debian/control4
-rwxr-xr-xsetup.py3
3 files changed, 15 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 06da4456..e0c03f5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+python-apt (0.7.9~exp2ubuntu11) jaunty; urgency=low
+
+ [ Matthias Klose ]
+ * Build for python2.4 as well. LP: #354812.
+
+ [ Michael vogt ]
+ * setup.py:
+ - only use sphinx for python2.5 or later
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 16 Apr 2009 16:50:38 +0200
+
python-apt (0.7.9~exp2ubuntu10) jaunty; urgency=low
* .bzr-buildpackage/default.conf:
diff --git a/debian/control b/debian/control
index c5200fba..abae4b5b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-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.20), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.6.11), python-all-dbg, python-sphinx (>= 0.5)
+XS-Python-Version: 2.4, all
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.20), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.6.11), python-all-dbg, python-sphinx (>= 0.5), python2.4-dev, python2.4-dbg
XS-Original-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu
diff --git a/setup.py b/setup.py
index 6a22734d..1783d4cc 100755
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,8 @@ setup(name="python-apt",
license = 'GNU GPL',
platforms = 'posix')
-if len(sys.argv) > 1 and sys.argv[1] == "build":
+if (len(sys.argv) > 1 and sys.argv[1] == "build" and
+ sys.version_info[0] >= 2 and sys.version_info[1] >= 5):
import sphinx
sphinx.main(["sphinx", "-b", "html", "-d", "build/doc/doctrees",
os.path.abspath("doc/source"), "build/doc/html"])