debian: restructure packages

Consolidate.  Fix dependencies.

diff --git a/debian/ceph-common.dirs b/debian/ceph-common.dirs
deleted file mode 100644 (file)
index 3bba141..0000000
--- a/debian/ceph-common.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-var/log/ceph
-var/log/ceph/stat
-etc/ceph
\ No newline at end of file

diff --git a/debian/ceph-common.init b/debian/ceph-common.init
deleted file mode 120000 (symlink)
index b538109..0000000
--- a/debian/ceph-common.init
+++ /dev/null
@@ -1 +0,0 @@
-../src/init-ceph
\ No newline at end of file

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
deleted file mode 100644 (file)
index f9dd556..0000000
--- a/debian/ceph-common.install
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/bin/ceph
-usr/bin/cconf
-usr/bin/crushtool
-usr/bin/monmaptool
-usr/bin/osdmaptool
-usr/bin/csyn
-usr/bin/crun
-usr/sbin/mount.ceph
-usr/sbin/mkcephfs
-usr/lib/ceph/ceph_common.sh
-etc/ceph/sample.ceph.conf
-etc/ceph/sample.cluster.conf
\ No newline at end of file

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

diff --git a/debian/ceph-doc.docs b/debian/ceph-doc.docs
deleted file mode 100644 (file)
index d4f4542..0000000
--- a/debian/ceph-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-#DOCS#

diff --git a/debian/ceph-kclient-source.dirs b/debian/ceph-kclient-source.dirs
new file mode 100644 (file)
index 0000000..8de417f
--- /dev/null
+++ b/debian/ceph-kclient-source.dirs
@@ -0,0 +1 @@
+usr/src/modules

diff --git a/debian/ceph-kclient-source.install b/debian/ceph-kclient-source.install
new file mode 100644 (file)
index 0000000..132681b
--- /dev/null
+++ b/debian/ceph-kclient-source.install
@@ -0,0 +1 @@
+usr/src/*

diff --git a/debian/ceph-mds.dirs b/debian/ceph-mds.dirs
deleted file mode 100644 (file)
index e772481..0000000
--- a/debian/ceph-mds.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin

diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install
deleted file mode 100644 (file)
index 59ecb48..0000000
--- a/debian/ceph-mds.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/cmds

diff --git a/debian/ceph-misc.dirs b/debian/ceph-misc.dirs
deleted file mode 100644 (file)
index e772481..0000000
--- a/debian/ceph-misc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin

diff --git a/debian/ceph-misc.install b/debian/ceph-misc.install
deleted file mode 100644 (file)
index 6b3af01..0000000
--- a/debian/ceph-misc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/dumpjournal
-usr/bin/streamtest

diff --git a/debian/ceph-mon.install b/debian/ceph-mon.install
deleted file mode 100644 (file)
index 402af62..0000000
--- a/debian/ceph-mon.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/cmon
-usr/bin/mkmonfs

diff --git a/debian/ceph-osd.dirs b/debian/ceph-osd.dirs
deleted file mode 100644 (file)
index e772481..0000000
--- a/debian/ceph-osd.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
deleted file mode 100644 (file)
index 0266757..0000000
--- a/debian/ceph-osd.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/cosd
-usr/bin/dupstore
-

diff --git a/debian/ceph-source.dirs b/debian/ceph-source.dirs
deleted file mode 100644 (file)
index 8de417f..0000000
--- a/debian/ceph-source.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/src/modules

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

diff --git a/debian/ceph.dirs b/debian/ceph.dirs
new file mode 100644 (file)
index 0000000..aa72f8a
--- /dev/null
+++ b/debian/ceph.dirs
@@ -0,0 +1,5 @@
+usr/bin
+var/log/ceph
+var/log/ceph/stat
+etc/ceph
+usr/share/doc/ceph

diff --git a/debian/ceph.docs b/debian/ceph.docs
new file mode 100644 (file)
index 0000000..d4f4542
--- /dev/null
+++ b/debian/ceph.docs
@@ -0,0 +1 @@
+#DOCS#

diff --git a/debian/ceph.init b/debian/ceph.init
new file mode 120000 (symlink)
index 0000000..b538109
--- /dev/null
+++ b/debian/ceph.init
@@ -0,0 +1 @@
+../src/init-ceph
\ No newline at end of file

diff --git a/debian/ceph.install b/debian/ceph.install
new file mode 100644 (file)
index 0000000..cc42320
--- /dev/null
+++ b/debian/ceph.install
@@ -0,0 +1,17 @@
+usr/bin/ceph
+usr/bin/cconf
+usr/bin/crushtool
+usr/bin/monmaptool
+usr/bin/osdmaptool
+usr/bin/csyn
+usr/bin/crun
+usr/bin/cmon
+usr/bin/cmds
+usr/bin/cosd
+usr/bin/dupstore
+usr/bin/mkmonfs
+usr/sbin/mount.ceph
+usr/sbin/mkcephfs
+usr/lib/ceph/ceph_common.sh
+etc/ceph/sample.ceph.conf
+etc/ceph/sample.cluster.conf

diff --git a/debian/control b/debian/control
index 91a412fc6f343091ee22ed2f62f27146a440903a..0c56ddf8b2d33b311f1ec858f3cea18a8fb7db23 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,52 +7,15 @@ Standards-Version: 3.7.2
 
 Package: ceph
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-mon, ceph-osd, ceph-mds, ceph-fuse, ceph-source, ceph-common
-Recommends: fuse-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, libedit, libboost
+Recommends: fuse-utils, ceph-fuse, ceph-kclient-source
 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}
-Description: Ceph distributed file system
- Ceph is a distributed network file system designed to provide
- excellent performance, reliability, and scalability.
- .
- This is the monitor package and contains the monitor daemon and associated
- utilities.
-
-Package: ceph-mds
-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 meta data server package and contains the meta data server daemon.
-
-Package: ceph-osd
-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 object storage package and contains the object storage daemon.
-
 Package: ceph-fuse
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse
 Description: Ceph distributed file system
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.
@@ -60,7 +23,7 @@ Description: Ceph distributed file system
  This is the ceph fuse package and contains the ceph fuse for mounting ceph
  with fuse.
 
-Package: ceph-source
+Package: ceph-kclient-source
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Ceph distributed file system
@@ -68,22 +31,3 @@ Description: Ceph distributed file system
  excellent performance, reliability, and scalability.
  .
  This is the ceph kernel source package for use with module-assistant.
-
-Package: ceph-misc
-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 ceph misc installed binaries.
-
-Package: ceph-doc
-Architecture: all
-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 ceph documentation.
-