aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules25
3 files changed, 7 insertions, 22 deletions
diff --git a/debian/changelog b/debian/changelog
index 7b7f945..8963d17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
python-urllib3 (1.7.1-1) UNRELEASED; urgency=low
* New upstream release
+ * Switched to pybuild
* debian/compat
- Bumped debhelper compatibility level to 9
* debian/control
@@ -17,7 +18,7 @@ python-urllib3 (1.7.1-1) UNRELEASED; urgency=low
* debian/patches/06_fix_abuse_of_match_hostname_for_DoS.patch
- Removed since fixed upstream
- -- Daniele Tricoli <eriol@mornie.org> Wed, 16 Oct 2013 19:19:10 +0200
+ -- Daniele Tricoli <eriol@mornie.org> Wed, 16 Oct 2013 22:26:05 +0200
python-urllib3 (1.6-2) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 3c0dc6b..1aaec17 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Section: python
Priority: optional
Build-Depends:
debhelper (>= 9),
+ dh-python,
python-all (>= 2.6.6-3),
python-coverage (>= 3.4),
python-mock,
diff --git a/debian/rules b/debian/rules
index e2ed423..33e5b40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,16 @@
#!/usr/bin/make -f
export PYTHONWARNINGS=d
+export PYBUILD_DESTDIR_python2=debian/python-urllib3/
+export PYBUILD_DESTDIR_python3=debian/python3-urllib3/
-PYVERS := $(shell pyversions -r)
-PY3VERS := $(shell py3versions -r)
%:
- dh $@ --with python2,python3 --buildsystem=python_distutils
+ dh $@ --with python2,python3 --buildsystem=pybuild
override_dh_auto_configure:
rm -f urllib3/packages/six.py
-override_dh_auto_build:
- set -ex; \
- for python in $(PYVERS) $(PY3VERS); do \
- $$python setup.py build; \
- done
-
override_dh_auto_clean:
rm -rf build
rm -f .coverage
@@ -24,18 +18,7 @@ override_dh_auto_clean:
dh_auto_clean
override_dh_auto_install:
- set -ex; \
- for python in $(PYVERS); do \
- $$python setup.py install --skip-build --root debian/python-urllib3 \
- --install-layout deb; \
- done
-
- set -ex; \
- for python in $(PY3VERS); do \
- $$python setup.py install --skip-build --root debian/python3-urllib3 \
- --install-layout deb; \
- done
-
+ dh_auto_install
# Remove dummyserver/ tests to not pollute namespace.
rm -rf debian/python*-urllib3/usr/lib/python*/dist-packages/dummyserver