From 7e7431bbf7dc6b2b94c3b05fc7c8be321e0be315 Mon Sep 17 00:00:00 2001 From: Rob Smith Date: Sun, 6 Apr 2014 14:10:04 -0700 Subject: [PATCH] Revert "update debian package to use pybuild" This reverts commit 2ab2369dd74ef5622b719c35a5beec6e683ebe34. --- debian/compat | 2 +- debian/control | 11 ++--------- debian/rules | 10 +++++++--- debian/source/format | 1 - 4 files changed, 10 insertions(+), 14 deletions(-) mode change 100755 => 100644 debian/rules delete mode 100644 debian/source/format diff --git a/debian/compat b/debian/compat index 45a4fb75d..7f8f011eb 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +7 diff --git a/debian/control b/debian/control index 1350aa9fc..3888c8905 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,12 @@ Source: diamond Section: misc -X-Python-Version: >= 2.4 Priority: extra Maintainer: Rob Smith Homepage: https://github.com/BrightcoveOS/Diamond Vcs-Git: git://github.com/BrightcoveOS/Diamond.git Vcs-Browser: https://github.com/BrightcoveOS/Diamond -Build-Depends: debhelper (>= 8), - dh-python, - python-all, - python-setuptools, - python-mock, - python-configobj, - python-psutil -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 7), python (>= 2.4), python-support, python-mock, python-configobj, cdbs +Standards-Version: 3.9.1 Package: diamond Architecture: all diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index ee2f1f8a9..fb55c26ac --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,11 @@ #!/usr/bin/make -f # -*- makefile -*- -export PYBUILD_NAME=diamond +DEB_PYTHON_SYSTEM := pysupport -%: - dh $@ --with python2 --buildsystem=pybuild +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/python-distutils.mk + +clean:: + rm -rf build build-stamp configure-stamp build/ MANIFEST + dh_clean diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 89ae9db8f..000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native)