From f11acf2b15e62eb1fa79613bbebe9393697553f4 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 17 Jul 2016 22:05:37 +0800 Subject: [PATCH] debian: use python:Depends for ceph-{common,base,osd}'s deps * ceph-base: use ${python:Depends} instead of listing the python dependencies manually, dh_python2 will scan the requirements of ceph-detect-init. and fill the subst var for us. * ceph-common: add ${python:Depends}, as it packages ceph, and ceph-brag client. * ceph-osd: it packages ceph-disk, so should add ${python:Depends} as its dependencies. dh_python2 will figure them out. Signed-off-by: Kefu Chai --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 387b2a7ddb10..34586eb68292 100644 --- a/debian/control +++ b/debian/control @@ -89,9 +89,7 @@ Depends: binutils, grep, logrotate, lsb-release, - python, - python-argparse | libpython2.7-stdlib, - python-pkg-resources, + ${python:Depends}, sdparm | hdparm, xfsprogs, ${misc:Depends}, @@ -179,6 +177,7 @@ Architecture: linux-any Depends: ceph-base (= ${binary:Version}), parted, ${misc:Depends}, + ${python:Depends}, ${shlibs:Depends} Recommends: ceph-common (= ${binary:Version}) Replaces: ceph (<< 10) @@ -319,6 +318,7 @@ Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, python-rados (= ${binary:Version}), python-cephfs (= ${binary:Version}), python-rbd (= ${binary:Version}), + ${python:Depends}, python-requests Conflicts: ceph-client-tools Replaces: ceph-client-tools, -- 2.47.3