debian: move ceph_argparse into ceph-common

Prior to this commit, if a user installed the "ceph-common" Debian
package without installing "ceph", then /usr/bin/ceph would crash
because it was missing the ceph_argparse library.

Ship the ceph_argparse library in "ceph-common" instead of "ceph". (This
was the intention of the original commit that moved argparse to "ceph",
2a23eac54957e596d99985bb9e187a668251a9ec)

http://tracker.ceph.com/issues/11388 Refs: #11388

Reported-by: Jens Rosenboom <j.rosenboom@x-ion.de>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 110608e5bdd9e2f03020ad41f0c2d756684d4417)

Conflicts:
	debian/ceph.install
            There is no ceph_daemon.py in hammer
        debian/control
            Depends/Replaces/Breaks version adapted (from 9.0.0 to 0.94.2)
            also adapted ceph-dbg Replaces/Breaks

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index e1fb65e33ab0e809be70914b1f5b41a55531795d..4e21adff9c47439dd7b177892b4603f0b1e8489b 100644 (file)
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -26,3 +26,4 @@ usr/share/ceph/id_dsa_drop.ceph.com.pub
 etc/ceph/rbdmap
 etc/init.d/rbdmap
 lib/udev/rules.d/50-rbd.rules
+usr/lib/python*/dist-packages/ceph_argparse.py*

diff --git a/debian/ceph.install b/debian/ceph.install
index 6a405214ee8f4a6781443a96df02030372e24166..d6d087168ca3801dfdf48f1fa92e097dc5be03ef 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -34,4 +34,3 @@ usr/share/man/man8/ceph-rest-api.8
 usr/share/man/man8/crushtool.8
 usr/share/man/man8/monmaptool.8
 usr/share/man/man8/osdmaptool.8
-usr/lib/python*/dist-packages/ceph_argparse.py*

diff --git a/debian/control b/debian/control
index 4f9fc9f8f8abff268e22b56f3f3f01d461a69f88..3f50468a706a25952a2e6b0f8127de216500976b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Standards-Version: 3.9.3
 Package: ceph
 Architecture: linux-any
 Depends: binutils,
-         ceph-common (>= 0.78-500),
+         ceph-common (>> 0.94.2),
          cryptsetup-bin | cryptsetup,
          gdisk,
          parted,
@@ -92,8 +92,8 @@ Architecture: linux-any
 Section: debug
 Priority: extra
 Depends: ceph (= ${binary:Version}), ${misc:Depends}
-Replaces: ceph-test-dbg (<< 0.94.2)
-Breaks: ceph-test-dbg (<< 0.94.2)
+Replaces: ceph-test-dbg (<= 0.94.2)
+Breaks: ceph-test-dbg (<= 0.94.2)
 Description: debugging symbols for ceph
  Ceph is a distributed storage system designed to provide excellent
  performance, reliability, and scalability.
@@ -191,10 +191,10 @@ Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
         python-requests
 Conflicts: ceph-client-tools
 Replaces: ceph-client-tools,
-         ceph (<< 0.78-500),
+         ceph (<= 0.94.2),
          python-ceph (<< 0.92-1223),
          librbd1 (<< 0.92-1238)
-Breaks: ceph (<< 0.78-500),
+Breaks: ceph (<= 0.94.2),
        python-ceph (<< 0.92-1223),
        librbd1 (<< 0.92-1238)
 Suggests: ceph, ceph-mds