Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345479 )
Change subject: Force a pythonic build, ignoring the Makefile
......................................................................
Force a pythonic build, ignoring the Makefile
Note that the deb packaging for precise still requires" dh-python" in
Build-Depends...
Change-Id: I07b0eb432c4f6fc6709709eda58e0861117e49bf
---
M Makefile
M debian/control
M debian/rules
3 files changed, 8 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/79/345479/1
diff --git a/Makefile b/Makefile
index fb7bc49..a8e6b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
.PHONY: \
+ clean \
coverage \
deb
@@ -8,6 +9,11 @@
noop:
@echo Nothing to do!
+clean:
+ rm -rf debian/process-control*
+ rm -f debian/files
+ rm -f debian/debhelper-build-stamp
+
coverage:
nosetests --with-coverage --cover-package=processcontrol --cover-html
@echo Results are in cover/index.html
diff --git a/debian/control b/debian/control
index bfd362a..db3446a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@
Maintainer: Adam Roses Wight <awi...@wikimedia.org>
Section: admin
Priority: optional
-Build-Depends: debhelper (>= 9), dh-python, python-all, python-setuptools
+Build-Depends: debhelper (>= 9), python-all, python-setuptools
Standards-Version: 3.9.8
Homepage: https://github.com/adamwight/process-control
Vcs-Browser: https://github.com/adamwight/process-control
diff --git a/debian/rules b/debian/rules
index 6af70d4..aa7fd0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
export PYBUILD_NAME=process-control
%:
- dh $@ --with python2
+ dh $@ -Spython_distutils --with python2
--
To view, visit https://gerrit.wikimedia.org/r/345479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07b0eb432c4f6fc6709709eda58e0861117e49bf
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
