From: Kefu Chai <kchai@redhat.com>
Date: Sun, 17 Jul 2016 14:05:37 +0000 (+0800)
Subject: debian: use python:Depends for ceph-{common,base,osd}'s deps
X-Git-Tag: ses5-milestone5~329^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F10322%2Fhead;p=ceph.git

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 <kchai@redhat.com>
---

diff --git a/debian/control b/debian/control
index 387b2a7ddb1..34586eb6829 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,