Merge pull request #1581 from ceph/wip-init

a few deb changes

7 files changed, 13 insertions, 10 deletions

diff --git a/debian/ceph-common.dirs b/debian/ceph-common.dirs
new file mode 100644
index 00000000000..4987b42ac97
--- /dev/null
+++ b/debian/ceph-common.dirs
@@ -0,0 +1,2 @@
+etc/ceph
+var/log/ceph
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 52f1c18c3cb..d49b4d790b9 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -4,7 +4,6 @@ usr/bin/ceph
 usr/bin/ceph-authtool
 usr/bin/ceph-conf
 usr/bin/ceph-dencoder
-usr/bin/ceph-rest-api
 usr/bin/ceph-syn
 usr/bin/ceph-crush-location
 usr/bin/rados
@@ -14,7 +13,6 @@ usr/bin/ceph-brag
 usr/share/man/man8/ceph-authtool.8
 usr/share/man/man8/ceph-conf.8
 usr/share/man/man8/ceph-dencoder.8
-usr/share/man/man8/ceph-rest-api.8
 usr/share/man/man8/ceph-syn.8
 usr/share/man/man8/ceph-post-file.8
 usr/share/man/man8/ceph.8
@@ -23,3 +21,5 @@ usr/share/man/man8/rbd.8
 usr/share/ceph/known_hosts_drop.ceph.com
 usr/share/ceph/id_dsa_drop.ceph.com
 usr/share/ceph/id_dsa_drop.ceph.com.pub
+etc/ceph/rbdmap
+etc/init.d/rbdmap
\ No newline at end of file
diff --git a/debian/ceph.postrm b/debian/ceph-common.postrm
index 48e4853c084..b62185483cb 100644
--- a/debian/ceph.postrm
+++ b/debian/ceph-common.postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for ceph
+# postrm script for ceph-common
 #
 # see: dh_installdeb(1)
 
diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index ca7a880636c..21b6c23ca03 100644
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,5 +1,3 @@
-etc/ceph
-var/log/ceph
 var/lib/ceph/tmp
 var/lib/ceph/mon
 var/lib/ceph/osd
diff --git a/debian/ceph.install b/debian/ceph.install
index b7f16d3d484..a0647a5f51e 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -11,6 +11,7 @@ usr/bin/ceph-debugpack
 usr/bin/ceph-mon
 usr/bin/ceph-osd
 usr/bin/ceph-run
+usr/bin/ceph-rest-api
 usr/bin/ceph_mon_store_converter
 usr/bin/crushtool
 usr/bin/monmaptool
@@ -25,9 +26,8 @@ usr/share/man/man8/ceph-debugpack.8
 usr/share/man/man8/ceph-mon.8
 usr/share/man/man8/ceph-osd.8
 usr/share/man/man8/ceph-run.8
+usr/share/man/man8/ceph-rest-api.8
 usr/share/man/man8/crushtool.8
 usr/share/man/man8/mkcephfs.8
 usr/share/man/man8/monmaptool.8
 usr/share/man/man8/osdmaptool.8
-etc/ceph/rbdmap
-etc/init.d/rbdmap
diff --git a/debian/control b/debian/control
index 68b8e75e050..28848bd152a 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Standards-Version: 3.9.3
 Package: ceph
 Architecture: linux-any
 Depends: binutils,
-         ceph-common (>= 0.67),
+         ceph-common (>= 0.78-500),
          cryptsetup-bin | cryptsetup,
          gdisk,
          parted,
@@ -58,6 +58,7 @@ Depends: binutils,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: btrfs-tools, ceph-mds, librados2, librbd1
+Replaces: ceph-common (<< 0.78-500)
 X-Python-Version: >= 2.6
 Description: distributed storage and file system
  Ceph is a distributed storage system designed to provide excellent
@@ -160,7 +161,8 @@ Architecture: linux-any
 Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
          python-ceph (= ${binary:Version}), python-requests
 Conflicts: ceph-client-tools
-Replaces: ceph-client-tools
+Replaces: ceph-client-tools, ceph (<< 0.78-500)
+Breaks: ceph (<< 0.78-500)
 Suggests: ceph, ceph-mds
 Description: common utilities to mount and interact with a ceph storage cluster
  Ceph is a distributed storage and file system designed to provide
diff --git a/debian/rules b/debian/rules
index 9b26a3cda83..81f578e82e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,8 @@ binary-arch: build install
 	# per package, so do this ourselves
 	install -d -m0755 debian/ceph/etc/init
 	install -m0644 src/upstart/ceph*.conf debian/ceph/etc/init
-	install -m0644 src/upstart/rbdmap.conf debian/ceph/etc/init
+	install -d -m0755 debian/ceph-common/etc/init
+	install -m0644 src/upstart/rbdmap.conf debian/ceph-common/etc/init
 	install -d -m0755 debian/ceph-mds/etc/init
 	mv debian/ceph/etc/init/ceph-mds* debian/ceph-mds/etc/init
 	install -d -m0755 debian/radosgw/etc/init