From: Ken Dreyer <kdreyer@redhat.com>
Date: Tue, 14 Apr 2015 13:58:17 +0000 (-0600)
Subject: debian: move ceph_argparse into ceph-common
X-Git-Tag: v9.0.2~133^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=110608e5bdd9e2f03020ad41f0c2d756684d4417;p=ceph.git

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>
---

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index e1fb65e33ab0..4e21adff9c47 100644
--- 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 6278c437589c..dce279155ea8 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -37,5 +37,4 @@ 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*
 usr/lib/python*/dist-packages/ceph_daemon.py*
diff --git a/debian/control b/debian/control
index af0125543a1e..98945661c00b 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,7 @@ Standards-Version: 3.9.3
 Package: ceph
 Architecture: linux-any
 Depends: binutils,
-         ceph-common (>= 0.78-500),
+         ceph-common (>= 9.0.0-943),
          cryptsetup-bin | cryptsetup,
          gdisk,
          parted,
@@ -190,10 +190,10 @@ Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
 	 python-requests
 Conflicts: ceph-client-tools
 Replaces: ceph-client-tools,
-	  ceph (<< 0.78-500),
+	  ceph (<< 9.0.0-943),
 	  python-ceph (<< 0.92-1223),
 	  librbd1 (<< 0.92-1238)
-Breaks: ceph (<< 0.78-500),
+Breaks: ceph (<< 9.0.0-943),
 	python-ceph (<< 0.92-1223),
 	librbd1 (<< 0.92-1238)
 Suggests: ceph, ceph-mds