From 3e5e55408312ceeb06567430ec319e9e25b649a7 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 8 Oct 2008 16:18:10 -0700
Subject: [PATCH] debian: move map tools and crun to ceph-common

---
 debian/ceph-common.dirs    |  1 +
 debian/ceph-common.install |  5 +++++
 debian/ceph-doc.install    |  2 +-
 debian/ceph-mds.install    |  1 -
 debian/ceph-mon.install    |  6 ------
 debian/ceph-osd.install    |  1 -
 debian/ceph.dirs           |  1 -
 debian/ceph.install        |  1 -
 debian/control             | 11 ++++++++++-
 9 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 debian/ceph-common.dirs
 create mode 100644 debian/ceph-common.install
 delete mode 100644 debian/ceph.dirs
 delete mode 100644 debian/ceph.install

diff --git a/debian/ceph-common.dirs b/debian/ceph-common.dirs
new file mode 100644
index 0000000000000..1e881eda3a544
--- /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
index 0000000000000..9a16d814c23d3
--- /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 d4f45425847a7..fb77425e99e5d 100644
--- 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 f654637d58b35..59ecb48d051a6 100644
--- 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 ec9103a51ac60..63605eb2af964 100644
--- 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 b0c4d4896fddd..02667577cd712 100644
--- 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
index 480578e9aedb7..0000000000000
--- 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
index fb77425e99e5d..0000000000000
--- a/debian/ceph.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/ceph/*
diff --git a/debian/control b/debian/control
index 9f882ba62a78a..eb75486cde6fa 100644
--- 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}
-- 
2.39.5