build/ops: deb: add python dependencies where needed

this reverts 48f4576 and f140a8c

Fixes: http://tracker.ceph.com/issues/17579
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/debian/control b/debian/control
index 983e9b9e91ba9d33e7ebe1341909ec6961b26d1f..822606ef7fe049994b50de7380ce716e2f45f785 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -148,6 +148,7 @@ Package: ceph-mgr
 Architecture: linux-any
 Depends: ceph-base (= ${binary:Version}),
          ${misc:Depends},
+         ${python:Depends},
          ${shlibs:Depends}
 Replaces: ceph (<< 0.93-417)
 Breaks: ceph (<< 0.93-417)
@@ -664,6 +665,7 @@ Architecture: linux-any
 Section: python
 Depends: librados2 (= ${binary:Version}),
          ${misc:Depends},
+         ${shlibs:Depends},
          ${python:Depends}
 Replaces: python-ceph (<< 0.92-1223)
 Breaks: python-ceph (<< 0.92-1223)
@@ -680,6 +682,7 @@ Architecture: linux-any
 Section: python
 Depends: librados2 (= ${binary:Version}),
          ${misc:Depends},
+         ${shlibs:Depends},
          ${python3:Depends}
 Description: Python 3 libraries for the Ceph librados library
  Ceph is a massively scalable, open-source, distributed
@@ -694,6 +697,7 @@ Architecture: linux-any
 Section: python
 Depends: librbd1 (>= ${binary:Version}),
          ${misc:Depends},
+         ${shlibs:Depends},
          ${python:Depends}
 Replaces: python-ceph (<< 0.92-1223)
 Breaks: python-ceph (<< 0.92-1223)
@@ -710,6 +714,7 @@ Architecture: linux-any
 Section: python
 Depends: librbd1 (>= ${binary:Version}),
          ${misc:Depends},
+         ${shlibs:Depends},
          ${python3:Depends}
 Description: Python 3 libraries for the Ceph librbd library
  Ceph is a massively scalable, open-source, distributed
@@ -724,6 +729,7 @@ Architecture: linux-any
 Section: python
 Depends: libcephfs1 (= ${binary:Version}),
          ${misc:Depends},
+         ${shlibs:Depends},
          ${python:Depends}
 Replaces: python-ceph (<< 0.92-1223)
 Breaks: python-ceph (<< 0.92-1223)
@@ -740,6 +746,7 @@ Architecture: linux-any
 Section: python
 Depends: libcephfs1 (= ${binary:Version}),
          ${misc:Depends},
+         ${shlibs:Depends},
          ${python3:Depends}
 Description: Python 3 libraries for the Ceph libcephfs library
  Ceph is a massively scalable, open-source, distributed

diff --git a/debian/rules b/debian/rules
index 414120704cf39cad0e77580b017863663b30bd94..1fa764ed82d06795e6a8abcecf589b8a8d29007c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -139,9 +139,7 @@ override_dh_strip:
        dh_strip -pceph-test --dbg-package=ceph-test-dbg
 
 override_dh_shlibdeps:
-       dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor \
-         --exclude=python-rados --exclude=python-cephfs --exclude=python-rbd    \
-         --exclude=python3-rados --exclude=python3-cephfs --exclude=python3-rbd \
+       dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor
 
 override_dh_python2:
        for binding in rados cephfs rbd; do                                \
@@ -150,6 +148,7 @@ override_dh_python2:
        dh_python2 -p ceph-common
        dh_python2 -p ceph-base
        dh_python2 -p ceph-osd
+       dh_python2 -p ceph-mgr
 
 override_dh_python3:
        for binding in rados cephfs rbd; do                                \