1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 Date: Tue, 2 Jun 2020 17:20:44 +0200
4 Subject: [PATCH] d/control: move python dependencies over to python3
6 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
8 debian/control | 24 ++++++++++++------------
9 debian/rules | 10 ------------
10 2 files changed, 12 insertions(+), 22 deletions(-)
12 diff --git a/debian/control b/debian/control
13 index c93aa3c21..aa8edb3d2 100644
16 @@ -138,7 +138,7 @@ Depends: binutils,
23 Recommends: btrfs-tools,
24 ceph-mds (= ${binary:Version}),
25 @@ -184,7 +184,7 @@ Package: cephadm
26 Architecture: linux-any
27 Recommends: podman (>= 2.0.2) | docker.io
31 Description: cephadm utility to bootstrap ceph daemons with systemd and containers
32 Ceph is a massively scalable, open-source, distributed
33 storage system that runs on commodity hardware and delivers object,
34 @@ -237,7 +237,8 @@ Depends: ceph-base (= ${binary:Version}),
42 Suggests: ceph-mgr-dashboard,
43 ceph-mgr-diskprediction-local,
44 @@ -263,7 +263,7 @@ Depends: ceph-mgr (= ${binary:Version}),
51 Description: dashboard module for ceph-mgr
52 Ceph is a massively scalable, open-source, distributed
53 @@ -284,7 +284,7 @@ Depends: ceph-mgr (= ${binary:Version}),
60 Description: diskprediction-local module for ceph-mgr
61 Ceph is a massively scalable, open-source, distributed
62 @@ -297,7 +297,7 @@ Description: diskprediction-local module for ceph-mgr
63 Package: ceph-mgr-modules-core
65 Depends: ${misc:Depends},
71 @@ -317,7 +317,7 @@ Depends: ceph-mgr (= ${binary:Version}),
72 Depends: ceph-mgr (= ${binary:Version}),
78 Description: rook module for ceph-mgr
79 Ceph is a massively scalable, open-source, distributed
80 @@ -333,7 +333,7 @@ Architecture: all
81 Depends: ceph-mgr (= ${binary:Version}),
86 Description: kubernetes events module for ceph-mgr
87 Ceph is a massively scalable, open-source, distributed
88 storage system that runs on commodity hardware and delivers object,
89 @@ -348,7 +348,7 @@ Depends: ceph-mgr (= ${binary:Version}),
90 Depends: ceph-mgr (= ${binary:Version}),
97 Description: cephadm orchestrator module for ceph-mgr
98 @@ -412,7 +412,7 @@ Depends: ceph-base (= ${binary:Version}),
103 + ${python3:Depends},
105 Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14)
106 Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14)
107 @@ -620,7 +620,7 @@ Depends: librbd1 (= ${binary:Version}),
108 python3-rbd (= ${binary:Version}),
109 python3-rgw (= ${binary:Version}),
112 + ${python3:Depends},
114 Conflicts: ceph-client-tools,
115 Replaces: ceph (<< 10),
116 diff --git a/debian/rules b/debian/rules
117 index c93aa3c21..aa8edb3d2 100755
121 override_dh_shlibdeps:
122 dh_shlibdeps -a --exclude=erasure-code --exclude=rados-classes --exclude=compressor
124 -override_dh_python3:
125 - for binding in rados cephfs rbd rgw; do \
126 - dh_python3 -p python3-$$binding; \
128 - dh_python3 -p python3-ceph-argparse
129 - dh_python3 -p python3-ceph-common
130 - dh_python3 -p cephfs-shell
131 - dh_python3 -p cephfs-top
132 - dh_python3 -p cephadm
135 override_dh_auto_test: