From 37f827cf8490f291b3da732e1a213fca1daa78a1 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 15 Jun 2013 16:13:46 +0100 Subject: [PATCH] debian: Abandon CDBS for plain Debhelper. --- MANIFEST.in | 4 ++-- debian/.gitignore | 3 --- debian/compat | 1 + debian/control | 3 ++- debian/rules | 9 +-------- 5 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 debian/compat diff --git a/MANIFEST.in b/MANIFEST.in index 813894a..57bb183 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -16,5 +16,5 @@ include pwsafe recursive-include catacomb *.py ## Debian. -include debian/rules debian/control debian/changelog debian/copyright - +include debian/rules debian/control debian/changelog +include debian/copyright debian/compat diff --git a/debian/.gitignore b/debian/.gitignore index 1e98f7c..24336ea 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -5,7 +5,4 @@ substvars *.debhelper python-catacomb-bin python-catacomb -python2.?-catacomb -compat -pycompat *.log diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index 069d81d..5b91beb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: python Priority: extra XS-Python-Version: >= 2.6, << 2.8 Maintainer: Mark Wooding -Build-Depends: catacomb-dev (>= 2.1.2), python, python2.6-dev, python2.7-dev +Build-Depends: debhelper (>= 9), catacomb-dev (>= 2.1.2), + python, python2.6-dev, python2.7-dev Standards-Version: 3.8.0 Package: python-catacomb diff --git a/debian/rules b/debian/rules index 6ebce3c..cec98bb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,2 @@ #! /usr/bin/make -f - -CDBS = /usr/share/cdbs/1 - -DEB_PYTHON_SYSTEM = pycentral -include $(CDBS)/rules/debhelper.mk -include $(CDBS)/class/python-distutils.mk - -###----- That's all, folks -------------------------------------------------- +%:; dh $@ --parallel -Bdebian/build -- 2.11.0