deb: merge ceph-fs-common into ceph-common

Fixes: http://tracker.ceph.com/issues/16808
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index c35ca002fe79e622d8be204ea91a1fedb94c8a50..49a5878b188e8a3a06fd826bd0af83fb72a825b2 100644 (file)
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -16,6 +16,7 @@ usr/bin/rbdmap
 usr/bin/rbd-replay*
 usr/bin/ceph-post-file
 usr/bin/ceph-brag
+usr/sbin/mount.ceph sbin
 usr/lib/ceph/compressor/*
 usr/share/man/man8/ceph-authtool.8
 usr/share/man/man8/ceph-conf.8
@@ -24,6 +25,7 @@ usr/share/man/man8/ceph-rbdnamer.8
 usr/share/man/man8/ceph-syn.8
 usr/share/man/man8/ceph-post-file.8
 usr/share/man/man8/ceph.8
+usr/share/man/man8/mount.ceph.8
 usr/share/man/man8/rados.8
 usr/share/man/man8/rbd.8
 usr/share/man/man8/rbdmap.8

diff --git a/debian/ceph-fs-common.install b/debian/ceph-fs-common.install
deleted file mode 100644 (file)
index ec61f9b..0000000
--- a/debian/ceph-fs-common.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin/mount.ceph sbin
-usr/share/man/man8/mount.ceph.8

diff --git a/debian/control b/debian/control
index 34586eb682928d7ad46b418f5c8c4d38820db95b..1c60af29b3ec61ba0d3fd230bfb4764ff60776f5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -116,8 +116,7 @@ Description: common ceph daemon libraries and management tools
 Package: ceph-mds
 Architecture: linux-any
 Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Recommends: ceph-fs-common (= ${binary:Version}),
-            ceph-fuse (= ${binary:Version}),
+Recommends: ceph-fuse (= ${binary:Version}),
             libcephfs1 (= ${binary:Version})
 Replaces: ceph (<< 0.93-417)
 Breaks: ceph (<< 0.93-417)
@@ -325,11 +324,13 @@ Replaces: ceph-client-tools,
          ceph (<< 10),
          ceph-test (<< 9.0.3-1646),
          python-ceph (<< 0.92-1223),
-         librbd1 (<< 0.92-1238)
+         librbd1 (<< 0.92-1238),
+         ceph-fs-common (<< 11.0)
 Breaks: ceph (<< 10),
        ceph-test (<< 9.0.3-1646),
        python-ceph (<< 0.92-1223),
-       librbd1 (<< 0.92-1238)
+       librbd1 (<< 0.92-1238),
+       ceph-fs-common (<< 11.0)
 Suggests: ceph-base (= ${binary:Version}), ceph-mds (= ${binary:Version})
 Description: common utilities to mount and interact with a ceph storage cluster
  Ceph is a massively scalable, open-source, distributed
@@ -354,34 +355,6 @@ Description: debugging symbols for ceph-common
  .
  This package contains the debugging symbols for ceph-common.
 
-Package: ceph-fs-common
-Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: ceph-client-tools
-Suggests: ceph-mds (= ${binary:Version})
-Description: common utilities to mount and interact with a ceph file system
- Ceph is a massively scalable, open-source, distributed
- storage system that runs on commodity hardware and delivers object,
- block and file system storage.  This is a collection
- of common tools, including the mount utility, that allows one to mount the
- Ceph file system with the kernel client.
-
-Package: ceph-fs-common-dbg
-Architecture: linux-any
-Depends: ceph-fs-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 massively scalable, open-source, distributed
- storage system that runs on commodity hardware and delivers object,
- block and file system storage.  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-fs-common.
-
 Package: ceph-resource-agents
 Architecture: linux-any
 Recommends: pacemaker

diff --git a/debian/rules b/debian/rules
index 02fbaf6a4212c2a8152f273423e80f861365145f..766ece9baa68727ae840dacd3163cd08d83e7a9f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -122,7 +122,6 @@ override_dh_strip:
        dh_strip -prbd-mirror --dbg-package=rbd-mirror-dbg
        dh_strip -prbd-nbd --dbg-package=rbd-nbd-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 -plibradosstriper1 --dbg-package=libradosstriper1-dbg
        dh_strip -plibrbd1 --dbg-package=librbd1-dbg