Merge version 12.2.11+dfsg1-2+rpi1 and 12.2.11+dfsg1-2.1 to produce 12.2.11+dfsg1...

diff --cc debian/changelog
index d813d816a1809af63a13e66bbfdcf2cb811e1d6b,44d4e3a672f63f4c591ffe17f1dbfc1574c41b5b..edc391e08cbe7d27cdc819acc1afb149e5355a0c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
- ceph (12.2.11+dfsg1-2+rpi1) buster-staging; urgency=medium
++ceph (12.2.11+dfsg1-2.1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Jul 2017 09:48:17 +0000]
 +  * Add Raspbian to lists of "debian-like" distros.
 +    + Hopefully this will fix site-packages vs dist-packages
 +      build failure in Raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Mar 2019 19:46:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Apr 2019 06:20:48 +0000
++
+ ceph (12.2.11+dfsg1-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * [3194010] Install ceph-volume@.service into ceph-osd.
+     (Closes: #924061)
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Fri, 05 Apr 2019 15:12:52 +0200
  
  ceph (12.2.11+dfsg1-2) unstable; urgency=medium