debian: split python-ceph

- move argparse to ceph-common
- split out rados, rbd, and cephfs bindings into their own packages
- keep python-ceph as a metapackage

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/debian/.gitignore b/debian/.gitignore
index 21b52f4e9d569d7f071a69960e9766634dbfca2d..0133d82881697fca37e8cade6cfa2d57db9b49dd 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -30,6 +30,9 @@
 /rest-bench-dbg
 /rest-bench
 /python-ceph
+/python-rados
+/python-rbd
+/python-cephfs
 /libcephfs-java
 /libcephfs-jni
 /tmp

diff --git a/debian/ceph.install b/debian/ceph.install
index 8089577c7a105827d7522f1b00526bfcde403c8d..4923bbc59502443182e9c11ef6eb7bb66e3e3397 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -32,3 +32,4 @@ usr/share/man/man8/ceph-rest-api.8
 usr/share/man/man8/crushtool.8
 usr/share/man/man8/monmaptool.8
 usr/share/man/man8/osdmaptool.8
+usr/lib/python*/dist-packages/ceph_argparse.py*

diff --git a/debian/control b/debian/control
index 7c4efa33a003a5e583952e83238894ef1bd651d4..a7caf00506416785cd099afc3c98c3ae7e20f105 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -72,8 +72,8 @@ Depends: binutils,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: btrfs-tools, ceph-mds, librados2, libradosstriper1, librbd1
-Replaces: ceph-common (<< 0.78-500), python-ceph (<< 0.85-979)
-Breaks: python-ceph (<< 0.85-979)
+Replaces: ceph-common (<< 0.78-500), python-ceph (<< 0.92-1223)
+Breaks: python-ceph (<< 0.92-1223)
 X-Python-Version: >= 2.6
 Description: distributed storage and file system
  Ceph is a massively scalable, open-source, distributed
@@ -181,10 +181,16 @@ Description: debugging symbols for rbd-fuse
 Package: ceph-common
 Architecture: linux-any
 Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
-         python-ceph (= ${binary:Version}), python-requests
+         python-rados (= ${binary:Version}),
+         python-cephfs (= ${binary:Version}),
+         python-rbd (= ${binary:Version}),
+        python-requests
 Conflicts: ceph-client-tools
-Replaces: ceph-client-tools, ceph (<< 0.78-500)
-Breaks: ceph (<< 0.78-500)
+Replaces: ceph-client-tools,
+         ceph (<< 0.78-500),
+         python-ceph (<< 0.92-1223)
+Breaks: ceph (<< 0.78-500),
+       python-ceph (<< 0.92-1223)
 Suggests: ceph, ceph-mds
 Description: common utilities to mount and interact with a ceph storage cluster
  Ceph is a massively scalable, open-source, distributed
@@ -465,16 +471,59 @@ Description: Ceph test and benchmarking tools
 Package: python-ceph
 Architecture: linux-any
 Section: python
-Depends: librados2, librbd1, libcephfs1, ${misc:Depends}, ${python:Depends}
-Replaces: ceph (<< 0.85-979)
+Depends: python-rados, python-rbd, python-cephfs
 X-Python-Version: >= 2.6
-Description: Python libraries for the Ceph distributed filesystem
+Description: Meta-package for python libraries for the Ceph libraries
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package is a metapackage for all python bindings.
+
+Package: python-rados
+Architecture: linux-any
+Section: python
+Depends: librados2, ${misc:Depends}, ${python:Depends}
+Replaces: python-ceph (<< 0.92-1223)
+Breaks: python-ceph (<< 0.92-1223)
+X-Python-Version: >= 2.6
+Description: Python libraries for the Ceph librados library
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains Python libraries for interacting with Ceph's
+ RADOS object storage.
+
+Package: python-rbd
+Architecture: linux-any
+Section: python
+Depends: librbd1, ${misc:Depends}, ${python:Depends}
+Replaces: python-ceph (<< 0.92-1223)
+Breaks: python-ceph (<< 0.92-1223)
+X-Python-Version: >= 2.6
+Description: Python libraries for the Ceph librbd library
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains Python libraries for interacting with Ceph's
+ RBD block device library.
+
+Package: python-cephfs
+Architecture: linux-any
+Section: python
+Depends: libcephfs1, ${misc:Depends}, ${python:Depends}
+Replaces: python-ceph (<< 0.92-1223)
+Breaks: python-ceph (<< 0.92-1223)
+X-Python-Version: >= 2.6
+Description: Python libraries for the Ceph libcephfs library
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,
  block and file system storage.
  .
  This package contains Python libraries for interacting with Ceph's
- RADOS object storage, and RBD (RADOS block device).
+ CephFS file system client library.
 
 Package: libcephfs-java
 Section: java

diff --git a/debian/python-ceph.install b/debian/python-ceph.install
deleted file mode 100644 (file)
index 427f7f1..0000000
--- a/debian/python-ceph.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/python*/dist-packages/rados.py*
-usr/lib/python*/dist-packages/rbd.py*
-usr/lib/python*/dist-packages/cephfs.py*
-usr/lib/python*/dist-packages/ceph_argparse.py*

diff --git a/debian/python-cephfs.install b/debian/python-cephfs.install
new file mode 100644 (file)
index 0000000..458102c
--- /dev/null
+++ b/debian/python-cephfs.install
@@ -0,0 +1 @@
+usr/lib/python*/dist-packages/cephfs.py*

diff --git a/debian/python-rados.install b/debian/python-rados.install
new file mode 100644 (file)
index 0000000..7012f60
--- /dev/null
+++ b/debian/python-rados.install
@@ -0,0 +1 @@
+usr/lib/python*/dist-packages/rados.py*

diff --git a/debian/python-rbd.install b/debian/python-rbd.install
new file mode 100644 (file)
index 0000000..a4ec715
--- /dev/null
+++ b/debian/python-rbd.install
@@ -0,0 +1 @@
+usr/lib/python*/dist-packages/rbd.py*