diff options
| author | Julian Andres Klode <jak@debian.org> | 2011-04-05 16:06:32 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2011-04-05 16:06:32 +0200 |
| commit | d260631958f70b4ea973d40b6eee10a53abdc73a (patch) | |
| tree | c99231e9ff262748dcaa346053e9b3bf7ebed9f4 /debian | |
| parent | 6ae5009c6cfe56b66a22848f80eff6239245f1e7 (diff) | |
| download | python-apt-d260631958f70b4ea973d40b6eee10a53abdc73a.tar.gz | |
Fix debian/rules to work correctly with tilde in version number
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 275d8cad..85714048 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ python-apt (0.8.0~exp1) UNRELEASED; urgency=low * Support (name, arch) tuples in apt_pkg.Cache mappings, wrapping FindPkg() with two string parameters. * Introduce apt_pkg.Cache.groups and apt_pkg.Cache.group_count + * Fix debian/rules to work correctly with tilde in version number -- Julian Andres Klode <jak@debian.org> Tue, 05 Apr 2011 10:33:54 +0200 diff --git a/debian/rules b/debian/rules index 0b60bf9f..c6c3e053 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,8 @@ export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') # For compatibility, add -DCOMPAT_0_7 export CFLAGS=-Wno-write-strings -export PATH :=$(CURDIR)/utils:$(PATH) -export SHELL = env PATH=$(PATH) sh +export PATH := $(CURDIR)/utils:$(PATH) +export pyversions := $(CURDIR)/utils/pyversions %: dh --with python2,python3 $@ @@ -36,7 +36,7 @@ override_dh_compress: # We ignore failures on hurd, since its locking is broken override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - set -e; for python in $(shell pyversions -r); do \ + set -e; for python in $(shell $(pyversions) -r); do \ $$python tests/test_all.py -q || [ "$(DEB_BUILD_ARCH_OS)" = "hurd" ]; \ done; else |