From: Sage Weil <sage@redhat.com>
Date: Thu, 17 Mar 2016 21:53:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/wip-strict-debian-deps'
X-Git-Tag: v10.1.0~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b18de23b5538778ef5da3cd17b267506d961f2a;p=ceph.git

Merge remote-tracking branch 'gh/wip-strict-debian-deps'
---

5b18de23b5538778ef5da3cd17b267506d961f2a
diff --cc debian/control
index a93df651e138,27ba113a0f91..a38434969516
--- a/debian/control
+++ b/debian/control
@@@ -97,11 -95,14 +97,15 @@@ Depends: binutils
           xfsprogs,
           ${misc:Depends},
           ${shlibs:Depends}
- Recommends: btrfs-tools, ceph-mds, librados2, libradosstriper1, librbd1
+ Recommends: btrfs-tools,
+             ceph-mds (= ${binary:Version}),
+             librados2 (= ${binary:Version}),
+             libradosstriper1 (= ${binary:Version}),
+             librbd1 (= ${binary:Version})
  Replaces: ceph-common (<< 0.78-500), python-ceph (<< 0.92-1223),
 -	  ceph-test (<< 0.94-1322)
 -Breaks: python-ceph (<< 0.92-1223), ceph-test (<< 0.94-1322)
 +	  ceph-test (<< 0.94-1322), ceph (<< 10)
 +Breaks: python-ceph (<< 0.92-1223), ceph-test (<< 0.94-1322), 
 +        ceph (<< 10)
  X-Python-Version: >= 2.6
  Description: common ceph daemon libraries and management tools
   Ceph is a massively scalable, open-source, distributed
@@@ -172,9 -175,9 +178,9 @@@ Description: debugging symbols for ceph
  Package: ceph-osd
  Architecture: linux-any
  Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
- Recommends: ceph-common
+ Recommends: ceph-common (= ${binary:Version})
 -Replaces: ceph (<< 9.0.1-1294)
 -Breaks: ceph (<< 9.0.1-1294)
 +Replaces: ceph (<< 10)
 +Breaks: ceph (<< 10)
  Description: OSD server for the ceph storage system
   Ceph is a massively scalable, open-source, distributed
   storage system that runs on commodity hardware and delivers object,