Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/218318
Change subject: Make package buildable on all of precise, trusty, jessie ...................................................................... Make package buildable on all of precise, trusty, jessie precise does not have dh_python. Fallback to using python_distutils as a build system for all three distributions for now and revisit once we no longer need precise support. Amend the changelog as well by adding the required Debian revision number. Override the clean step as well to allow using cowbuilder chroots Change-Id: I4495e6bdc6994b0dfc72af877d3886b09c6e137e --- M debian/changelog M debian/control A debian/python-etcd.install A debian/python3-etcd.install M debian/rules 5 files changed, 10 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-etcd refs/changes/18/218318/1 diff --git a/debian/changelog b/debian/changelog index bfc00e7..9201a1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-etcd (0.4.0~git20150609+ac25bd7ba2) UNRELEASED; urgency=medium +python-etcd (0.4.0~git20150609+ac25bd7ba2-1) UNRELEASED; urgency=medium * Sync with the latest upstream version diff --git a/debian/control b/debian/control index ad2213f..848eab2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Filippo Giunchedi <[email protected]> Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9), dh-python, +Build-Depends: debhelper (>= 9), python-all (>= 2.7), python-setuptools, python3-all, python3-setuptools, python-docutils, python-sphinx (>= 1.0.7+dfsg-1~), diff --git a/debian/python-etcd.install b/debian/python-etcd.install new file mode 100644 index 0000000..1b91047 --- /dev/null +++ b/debian/python-etcd.install @@ -0,0 +1 @@ +usr/ diff --git a/debian/python3-etcd.install b/debian/python3-etcd.install new file mode 100644 index 0000000..1b91047 --- /dev/null +++ b/debian/python3-etcd.install @@ -0,0 +1 @@ +usr/ diff --git a/debian/rules b/debian/rules index fce3fbb..7460e81 100755 --- a/debian/rules +++ b/debian/rules @@ -2,11 +2,13 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk -export PYBUILD_NAME=etcd -export PYBUILD_DISABLE=test - %: - dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild + dh $@ --with python2,python3,sphinxdoc --buildsystem=python_distutils + +clean: + dh_testdir + dh_auto_clean + dh_clean override_dh_auto_build: dh_auto_build -- To view, visit https://gerrit.wikimedia.org/r/218318 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4495e6bdc6994b0dfc72af877d3886b09c6e137e Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/python-etcd Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
