debian: move map tools and crun to ceph-common

diff --git a/debian/ceph-common.dirs b/debian/ceph-common.dirs
new file mode 100644 (file)
index 0000000..1e881ed
--- /dev/null
+++ b/debian/ceph-common.dirs
@@ -0,0 +1 @@
+usr/bin
\ No newline at end of file

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
new file mode 100644 (file)
index 0000000..9a16d81
--- /dev/null
+++ b/debian/ceph-common.install
@@ -0,0 +1,5 @@
+usr/bin/cmonctl
+usr/bin/crushtool
+usr/bin/monmaptool
+usr/bin/osdmaptool
+usr/bin/crun
\ No newline at end of file

diff --git a/debian/ceph-doc.install b/debian/ceph-doc.install
index d4f45425847a7098cf2ce10649a3ad5cdea54a7b..fb77425e99e5d9b435bdea9715f7fce8cfd3d20d 100644 (file)
--- a/debian/ceph-doc.install
+++ b/debian/ceph-doc.install
@@ -1 +1 @@
-#DOCS#
+usr/share/doc/ceph/*

diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install
index f654637d58b3518cf5ec674e41bb3d841ab6a35a..59ecb48d051a686bce813f6feb87d09787070b15 100644 (file)
--- a/debian/ceph-mds.install
+++ b/debian/ceph-mds.install
@@ -1,2 +1 @@
 usr/bin/cmds
-usr/bin/crun

diff --git a/debian/ceph-mon.install b/debian/ceph-mon.install
index ec9103a51ac60a7eead54b5b1728c12a175425fa..63605eb2af964211faf351da692262821fa795d6 100644 (file)
--- a/debian/ceph-mon.install
+++ b/debian/ceph-mon.install
@@ -1,9 +1,3 @@
 usr/bin/cmon
-usr/bin/cmonctl
-usr/bin/crushtool
 usr/bin/mkmonfs
-usr/bin/monmaptool
-usr/bin/osdmaptool
 usr/bin/csyn
-usr/bin/crun
-

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
index b0c4d4896fddd542fb1a5c9eb72253058a237b4f..02667577cd71268977f452efd4c6790537fc9ea9 100644 (file)
--- a/debian/ceph-osd.install
+++ b/debian/ceph-osd.install
@@ -1,4 +1,3 @@
 usr/bin/cosd
 usr/bin/dupstore
-usr/bin/crun
 

diff --git a/debian/ceph.dirs b/debian/ceph.dirs
deleted file mode 100644 (file)
index 480578e..0000000
--- a/debian/ceph.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/ceph

diff --git a/debian/ceph.install b/debian/ceph.install
deleted file mode 100644 (file)
index fb77425..0000000
--- a/debian/ceph.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/ceph/*

diff --git a/debian/control b/debian/control
index 9f882ba62a78a82f140900c18293c67dffa8026b..eb75486cde6fac1c4d937a138a43dced748fa1bf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,21 @@ Standards-Version: 3.7.2
 
 Package: ceph
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-mon, ceph-osd, ceph-mds, ceph-fuse, ceph-source
+Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-mon, ceph-osd, ceph-mds, ceph-fuse, ceph-source, ceph-common
 Recommends: fuse-utils
 Description: Ceph distributed file system
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.
 
+Package: ceph-common
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Ceph distributed file system
+ Ceph is a distributed network file system designed to provide
+ excellent performance, reliability, and scalability.
+ .
+ This is the common package with shared dependencies.
+
 Package: ceph-mon
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}