debian: move mount.ceph and cephfs into ceph-fs-common

Based on patches from Laszlo Boszormenyi (GCS) <gcs@debian.hu>.

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

4 files changed, 35 insertions, 10 deletions

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 47726639888..ffc467537ff 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -1,6 +1,4 @@
-sbin/mount.ceph
 usr/bin/ceph
-usr/bin/cephfs
 usr/bin/ceph-conf
 usr/bin/ceph-syn
 usr/bin/ceph-authtool
@@ -14,7 +12,5 @@ usr/share/man/man8/ceph-conf.8
 usr/share/man/man8/ceph-dencoder.8
 usr/share/man/man8/rados.8
 usr/share/man/man8/rbd.8
-usr/share/man/man8/mount.ceph.8
-usr/share/man/man8/cephfs.8
 etc/bash_completion.d/rados
 etc/bash_completion.d/rbd
diff --git a/debian/ceph-fs-common.install b/debian/ceph-fs-common.install
new file mode 100644
index 00000000000..9a50360fb00
--- /dev/null
+++ b/debian/ceph-fs-common.install
@@ -0,0 +1,4 @@
+sbin/mount.ceph
+usr/bin/cephfs
+usr/share/man/man8/mount.ceph.8
+usr/share/man/man8/cephfs.8
diff --git a/debian/control b/debian/control
index de3c3a83d28..34927665a80 100644
--- a/debian/control
+++ b/debian/control
@@ -67,11 +67,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, librbd1 (= ${binary:Version})
 Conflicts: ceph-client-tools
 Replaces: ceph-client-tools
 Suggests: ceph
-Description: common utilities to mount and interact with a ceph filesystem
- Ceph is a distributed network file system designed to provide
+Description: common utilities to mount and interact with a ceph storage cluster
+ Ceph is a distributed storage and file system designed to provide
  excellent performance, reliability, and scalability.  This is a collection
- of common tools, including the mount utility, that allows one to mount the
- ceph fs with the kernel client.
+ of common tools that allow one to interact with and administer a Ceph cluster.
 
 Package: ceph-common-dbg
 Architecture: linux-any
@@ -81,12 +80,37 @@ Replaces: ceph-client-tools-dbg
 Section: debug
 Priority: extra
 Description: debugging symbols for ceph-common
+ Ceph is a distributed storage and file system designed to provide
+ excellent performance, reliability, and scalability.  This is a collection
+ of common tools that allow one to interact with and administer a Ceph cluster.
+ .
+ This package contains the debugging symbols for ceph-common.
+
+Package: ceph-fs-common
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ceph-client-tools
+Suggests: ceph
+Description: common utilities to mount and interact with a ceph file system
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.  This is a collection
  of common tools, including the mount utility, that allows one to mount the
- ceph fs with the kernel client.
+ Ceph file system with the kernel client.
+
+Package: ceph-fs-common-dbg
+Architecture: linux-any
+Depends: ceph-common (= ${binary:Version}), ${misc:Depends}
+Conflicts: ceph-client-tools-dbg
+Replaces: ceph-client-tools-dbg
+Section: debug
+Priority: extra
+Description: debugging symbols for ceph-fs-common
+ Ceph is a distributed network file system designed to provide
+ excellent performance, reliability, and scalability.  This is a collection
+ of common tools, including the mount utility, that allows one to mount the
+ Ceph file system with the kernel client.
  .
- This package contains the debugging symbols for ceph-common.
+ This package contains the debugging symbols for ceph-fs-common.
 
 Package: ceph-resource-agents
 Architecture: linux-any
diff --git a/debian/rules b/debian/rules
index cbd81c46e44..2d788a93de0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,6 +117,7 @@ binary-arch: build install
 	dh_strip -pceph --dbg-package=ceph-dbg -k --exclude=libcls_
 	dh_strip -pceph-fuse --dbg-package=ceph-fuse-dbg
 	dh_strip -pceph-common --dbg-package=ceph-common-dbg
+	dh_strip -pceph-fs-common --dbg-package=ceph-fs-common-dbg
 	dh_strip -plibrados2 --dbg-package=librados2-dbg
 	dh_strip -plibrbd1 --dbg-package=librbd1-dbg
 	dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg