diff -Nru ceph-12.2.10+dfsg1/debian/changelog ceph-12.2.10+dfsg1/debian/changelog
--- ceph-12.2.10+dfsg1/debian/changelog	2018-12-29 21:08:52.000000000 +0000
+++ ceph-12.2.10+dfsg1/debian/changelog	2019-01-19 12:12:11.000000000 +0000
@@ -1,3 +1,12 @@
+ceph (12.2.10+dfsg1-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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Jan 2019 12:12:11 +0000
+
 ceph (12.2.10+dfsg1-1) unstable; urgency=medium
 
   * [22146e] ceph-base: create directory for bootstrap-rbd key
diff -Nru ceph-12.2.10+dfsg1/debian/patches/detect-raspbian.diff ceph-12.2.10+dfsg1/debian/patches/detect-raspbian.diff
--- ceph-12.2.10+dfsg1/debian/patches/detect-raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ ceph-12.2.10+dfsg1/debian/patches/detect-raspbian.diff	2019-01-19 12:12:11.000000000 +0000
@@ -0,0 +1,47 @@
+Description:  Add Raspbian to lists of "debian-like" distros.
+ Hopefully this will fix site-packages vs dist-packages
+ build failure in Raspbian.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ceph-12.2.10+dfsg1.orig/install-deps.sh
++++ ceph-12.2.10+dfsg1/install-deps.sh
+@@ -114,7 +114,7 @@ if [ x`uname`x = xFreeBSDx ]; then
+ else
+     source /etc/os-release
+     case $ID in
+-    debian|ubuntu|devuan)
++    debian|ubuntu|devuan|raspbian)
+         echo "Using apt-get to install dependencies"
+         $SUDO apt-get install -y lsb-release devscripts equivs
+         $SUDO apt-get install -y dpkg-dev gcc
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/ceph-helpers-root.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/ceph-helpers-root.sh
+@@ -26,7 +26,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+@@ -11,7 +11,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y --force-yes "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+@@ -39,7 +39,7 @@ CURRENT_PATH=`pwd`
+ # install prerequisites
+ # for rocksdb
+ case $(lsb_release -si) in
+-	Ubuntu|Debian|Devuan)
++	Ubuntu|Debian|Devuan|Raspbian)
+ 		install g++-4.7 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev librados-dev
+ 		;;
+ 	CentOS|Fedora|RedHatEnterpriseServer)
diff -Nru ceph-12.2.10+dfsg1/debian/patches/series ceph-12.2.10+dfsg1/debian/patches/series
--- ceph-12.2.10+dfsg1/debian/patches/series	2018-12-23 22:44:59.000000000 +0000
+++ ceph-12.2.10+dfsg1/debian/patches/series	2019-01-19 12:12:11.000000000 +0000
@@ -14,3 +14,4 @@
 armhf-ftbfs.patch
 boost-1.67-fixes.patch
 softfp-armel.patch
+detect-raspbian.diff
diff -Nru ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/changelog ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/changelog
--- ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/changelog	2018-12-29 21:08:52.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/changelog	2019-01-19 12:12:11.000000000 +0000
@@ -1,3 +1,12 @@
+ceph (12.2.10+dfsg1-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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Jan 2019 12:12:11 +0000
+
 ceph (12.2.10+dfsg1-1) unstable; urgency=medium
 
   * [22146e] ceph-base: create directory for bootstrap-rbd key
diff -Nru ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/patches/detect-raspbian.diff ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/patches/detect-raspbian.diff
--- ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/patches/detect-raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/patches/detect-raspbian.diff	2019-01-19 12:12:11.000000000 +0000
@@ -0,0 +1,47 @@
+Description:  Add Raspbian to lists of "debian-like" distros.
+ Hopefully this will fix site-packages vs dist-packages
+ build failure in Raspbian.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ceph-12.2.10+dfsg1.orig/install-deps.sh
++++ ceph-12.2.10+dfsg1/install-deps.sh
+@@ -114,7 +114,7 @@ if [ x`uname`x = xFreeBSDx ]; then
+ else
+     source /etc/os-release
+     case $ID in
+-    debian|ubuntu|devuan)
++    debian|ubuntu|devuan|raspbian)
+         echo "Using apt-get to install dependencies"
+         $SUDO apt-get install -y lsb-release devscripts equivs
+         $SUDO apt-get install -y dpkg-dev gcc
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/ceph-helpers-root.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/ceph-helpers-root.sh
+@@ -26,7 +26,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+@@ -11,7 +11,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y --force-yes "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+@@ -39,7 +39,7 @@ CURRENT_PATH=`pwd`
+ # install prerequisites
+ # for rocksdb
+ case $(lsb_release -si) in
+-	Ubuntu|Debian|Devuan)
++	Ubuntu|Debian|Devuan|Raspbian)
+ 		install g++-4.7 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev librados-dev
+ 		;;
+ 	CentOS|Fedora|RedHatEnterpriseServer)
diff -Nru ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/patches/series ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/patches/series
--- ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/patches/series	2018-12-23 22:44:59.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/debian-jessie/debian/patches/series	2019-01-19 12:12:11.000000000 +0000
@@ -14,3 +14,4 @@
 armhf-ftbfs.patch
 boost-1.67-fixes.patch
 softfp-armel.patch
+detect-raspbian.diff
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/changelog ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/changelog
--- ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/changelog	2018-12-29 21:08:52.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/changelog	2019-01-19 12:12:11.000000000 +0000
@@ -1,3 +1,12 @@
+ceph (12.2.10+dfsg1-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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Jan 2019 12:12:11 +0000
+
 ceph (12.2.10+dfsg1-1) unstable; urgency=medium
 
   * [22146e] ceph-base: create directory for bootstrap-rbd key
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/patches/detect-raspbian.diff ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/patches/detect-raspbian.diff
--- ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/patches/detect-raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/patches/detect-raspbian.diff	2019-01-19 12:12:11.000000000 +0000
@@ -0,0 +1,47 @@
+Description:  Add Raspbian to lists of "debian-like" distros.
+ Hopefully this will fix site-packages vs dist-packages
+ build failure in Raspbian.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ceph-12.2.10+dfsg1.orig/install-deps.sh
++++ ceph-12.2.10+dfsg1/install-deps.sh
+@@ -114,7 +114,7 @@ if [ x`uname`x = xFreeBSDx ]; then
+ else
+     source /etc/os-release
+     case $ID in
+-    debian|ubuntu|devuan)
++    debian|ubuntu|devuan|raspbian)
+         echo "Using apt-get to install dependencies"
+         $SUDO apt-get install -y lsb-release devscripts equivs
+         $SUDO apt-get install -y dpkg-dev gcc
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/ceph-helpers-root.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/ceph-helpers-root.sh
+@@ -26,7 +26,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+@@ -11,7 +11,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y --force-yes "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+@@ -39,7 +39,7 @@ CURRENT_PATH=`pwd`
+ # install prerequisites
+ # for rocksdb
+ case $(lsb_release -si) in
+-	Ubuntu|Debian|Devuan)
++	Ubuntu|Debian|Devuan|Raspbian)
+ 		install g++-4.7 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev librados-dev
+ 		;;
+ 	CentOS|Fedora|RedHatEnterpriseServer)
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/patches/series ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/patches/series
--- ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/patches/series	2018-12-23 22:44:59.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-12.04/debian/patches/series	2019-01-19 12:12:11.000000000 +0000
@@ -14,3 +14,4 @@
 armhf-ftbfs.patch
 boost-1.67-fixes.patch
 softfp-armel.patch
+detect-raspbian.diff
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/changelog ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/changelog
--- ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/changelog	2018-12-29 21:08:52.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/changelog	2019-01-19 12:12:11.000000000 +0000
@@ -1,3 +1,12 @@
+ceph (12.2.10+dfsg1-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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Jan 2019 12:12:11 +0000
+
 ceph (12.2.10+dfsg1-1) unstable; urgency=medium
 
   * [22146e] ceph-base: create directory for bootstrap-rbd key
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/patches/detect-raspbian.diff ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/patches/detect-raspbian.diff
--- ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/patches/detect-raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/patches/detect-raspbian.diff	2019-01-19 12:12:11.000000000 +0000
@@ -0,0 +1,47 @@
+Description:  Add Raspbian to lists of "debian-like" distros.
+ Hopefully this will fix site-packages vs dist-packages
+ build failure in Raspbian.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ceph-12.2.10+dfsg1.orig/install-deps.sh
++++ ceph-12.2.10+dfsg1/install-deps.sh
+@@ -114,7 +114,7 @@ if [ x`uname`x = xFreeBSDx ]; then
+ else
+     source /etc/os-release
+     case $ID in
+-    debian|ubuntu|devuan)
++    debian|ubuntu|devuan|raspbian)
+         echo "Using apt-get to install dependencies"
+         $SUDO apt-get install -y lsb-release devscripts equivs
+         $SUDO apt-get install -y dpkg-dev gcc
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/ceph-helpers-root.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/ceph-helpers-root.sh
+@@ -26,7 +26,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+@@ -11,7 +11,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y --force-yes "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+@@ -39,7 +39,7 @@ CURRENT_PATH=`pwd`
+ # install prerequisites
+ # for rocksdb
+ case $(lsb_release -si) in
+-	Ubuntu|Debian|Devuan)
++	Ubuntu|Debian|Devuan|Raspbian)
+ 		install g++-4.7 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev librados-dev
+ 		;;
+ 	CentOS|Fedora|RedHatEnterpriseServer)
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/patches/series ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/patches/series
--- ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/patches/series	2018-12-23 22:44:59.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-14.04/debian/patches/series	2019-01-19 12:12:11.000000000 +0000
@@ -14,3 +14,4 @@
 armhf-ftbfs.patch
 boost-1.67-fixes.patch
 softfp-armel.patch
+detect-raspbian.diff
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/changelog ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/changelog
--- ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/changelog	2018-12-29 21:08:52.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/changelog	2019-01-19 12:12:11.000000000 +0000
@@ -1,3 +1,12 @@
+ceph (12.2.10+dfsg1-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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 19 Jan 2019 12:12:11 +0000
+
 ceph (12.2.10+dfsg1-1) unstable; urgency=medium
 
   * [22146e] ceph-base: create directory for bootstrap-rbd key
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff
--- ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff	1970-01-01 00:00:00.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/patches/detect-raspbian.diff	2019-01-19 12:12:11.000000000 +0000
@@ -0,0 +1,47 @@
+Description:  Add Raspbian to lists of "debian-like" distros.
+ Hopefully this will fix site-packages vs dist-packages
+ build failure in Raspbian.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- ceph-12.2.10+dfsg1.orig/install-deps.sh
++++ ceph-12.2.10+dfsg1/install-deps.sh
+@@ -114,7 +114,7 @@ if [ x`uname`x = xFreeBSDx ]; then
+ else
+     source /etc/os-release
+     case $ID in
+-    debian|ubuntu|devuan)
++    debian|ubuntu|devuan|raspbian)
+         echo "Using apt-get to install dependencies"
+         $SUDO apt-get install -y lsb-release devscripts equivs
+         $SUDO apt-get install -y dpkg-dev gcc
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/ceph-helpers-root.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/ceph-helpers-root.sh
+@@ -26,7 +26,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+--- ceph-12.2.10+dfsg1.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
++++ ceph-12.2.10+dfsg1/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+@@ -11,7 +11,7 @@ function install() {
+ 
+ function install_one() {
+     case $(lsb_release -si) in
+-        Ubuntu|Debian|Devuan)
++        Ubuntu|Debian|Devuan|Raspbian)
+             sudo apt-get install -y --force-yes "$@"
+             ;;
+         CentOS|Fedora|RedHatEnterpriseServer)
+@@ -39,7 +39,7 @@ CURRENT_PATH=`pwd`
+ # install prerequisites
+ # for rocksdb
+ case $(lsb_release -si) in
+-	Ubuntu|Debian|Devuan)
++	Ubuntu|Debian|Devuan|Raspbian)
+ 		install g++-4.7 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev librados-dev
+ 		;;
+ 	CentOS|Fedora|RedHatEnterpriseServer)
diff -Nru ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/patches/series ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/patches/series
--- ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/patches/series	2018-12-23 22:44:59.000000000 +0000
+++ ceph-12.2.10+dfsg1/src/test/ubuntu-16.04/debian/patches/series	2019-01-19 12:12:11.000000000 +0000
@@ -14,3 +14,4 @@
 armhf-ftbfs.patch
 boost-1.67-fixes.patch
 softfp-armel.patch
+detect-raspbian.diff