Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: debian: make the debian tree compatible with precise
......................................................................


debian: make the debian tree compatible with precise

Change-Id: I265841ec72ec03f9d465854c09a176da59a48620
---
A debian/conftool.install
M debian/control
M debian/rules
M debian/source/format
4 files changed, 9 insertions(+), 8 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/debian/conftool.install b/debian/conftool.install
new file mode 100644
index 0000000..1b91047
--- /dev/null
+++ b/debian/conftool.install
@@ -0,0 +1 @@
+usr/
diff --git a/debian/control b/debian/control
index df75faf..1506ac7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Giuseppe Lavagetto <glavage...@wikimedia.org>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), dh-python,
-  python-all (>= 2.7), python-setuptools,
-  python-etcd (>= 0.3.4), python-yaml
+Build-Depends: debhelper (>= 9),
+  python-all (>= 2.7), python-setuptools
 Homepage: https://github.com/wikimedia/operations-software-conftool
 X-Python-Version: >= 2.7
 
diff --git a/debian/rules b/debian/rules
index c97f3e6..270db1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,10 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
-export PYBUILD_NAME=conftool
-export PYBUILD_DISABLE=tests
-
 %:
-       dh $@ --with python2 --buildsystem=pybuild
+       dh $@ --with python2 --buildsystem=python_distutils
 
+clean:
+       dh_testdir
+       dh_auto_clean
+       dh_clean
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

-- 
To view, visit https://gerrit.wikimedia.org/r/218597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I265841ec72ec03f9d465854c09a176da59a48620
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/conftool
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to