summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2010-01-17 12:54:16 +0100
committerJulian Andres Klode <jak@debian.org>2010-01-17 12:54:16 +0100
commit008a45f23d6999269f10978c3cb3ac11240451f9 (patch)
treefd0f4bd364135ac32de91f6e24a1a115368d81d4
parent34b01eb60ec315bc542d0cad7239091219a8388c (diff)
downloadpython-apt-008a45f23d6999269f10978c3cb3ac11240451f9.tar.gz
* Build for Python 2.5, 2.6 and 3.1; 2.6 and 3.1 hit unstable on Jan 16.
- Use DH_PYCENTRAL=nomove for now because include-links seems broken
-rw-r--r--debian/changelog4
-rw-r--r--debian/control10
-rwxr-xr-xdebian/rules3
3 files changed, 11 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index c2b8d7e6..ba6dbd40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ python-apt (0.7.93) UNRELEASED; urgency=low
* Merge debian-sid and debian-experimental.
* Add a tutorial on how to do things which are possible with apt-get,
like apt-get --print-uris update (cf. #551164).
- * Build for all supported Python versions newer than 2.5.
- - Disable 2.6 and 3.1 builds previously available in experimental.
+ * Build for Python 2.5, 2.6 and 3.1; 2.6 and 3.1 hit unstable on Jan 16.
+ - Use DH_PYCENTRAL=nomove for now because include-links seems broken
* Merge lp:~forest-bond/python-apt/cache-is-virtual-package-catch-key-error
- Return False in Cache.is_virtual_package if the package does not exist.
* Make all class-level constants have uppercase names.
diff --git a/debian/control b/debian/control
index 294deb1a..81fc00ee 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,16 @@ Priority: optional
Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
Standards-Version: 3.8.3
-XS-Python-Version: >= 2.5
+XS-Python-Version: 2.5, 2.6, 3.1
Build-Depends: apt-utils,
debhelper (>= 7.3.5),
libapt-pkg-dev (>= 0.7.22~),
- python-all-dbg,
- python-all-dev,
+ python2.5-dbg,
+ python2.5-dev,
+ python2.6-dev,
+ python2.6-dbg,
+ python3.1-dev,
+ python3.1-dbg,
python-central (>= 0.5),
python-distutils-extra (>= 2.0),
python-sphinx (>= 0.5)
diff --git a/debian/rules b/debian/rules
index 6c9f6fb6..1a45a710 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
-export DH_PYCENTRAL=include-links
+# Should be include-links, but that somehow fails.
+export DH_PYCENTRAL=nomove
export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
export CFLAGS=-Wno-write-strings -DCOMPAT_0_7