diff -Nru pandas-0.22.0/debian/changelog pandas-0.22.0/debian/changelog
--- pandas-0.22.0/debian/changelog	2018-05-29 13:51:00.000000000 +0000
+++ pandas-0.22.0/debian/changelog	2018-06-05 04:55:32.000000000 +0000
@@ -1,3 +1,15 @@
+pandas (0.22.0-7+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 0.20.3-10+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 04 Nov 2017 00:02:42 +0000]
+  * Disable testsuite.
+  * Add build-depends on python-ipykernel and python3-ipykernel
+  * Fix clean target.
+  [changes introduced in 0.20.3-11+rpi1 by Peter Michael Green]
+  * Add build-depends on python-lzma
+  * Disable documentation build.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Jun 2018 04:55:32 +0000
+
 pandas (0.22.0-7) unstable; urgency=medium
 
   * Team Upload.
diff -Nru pandas-0.22.0/debian/control pandas-0.22.0/debian/control
--- pandas-0.22.0/debian/control	2018-04-12 10:52:00.000000000 +0000
+++ pandas-0.22.0/debian/control	2018-06-05 04:55:32.000000000 +0000
@@ -41,6 +41,8 @@
                python3-html5lib,
                python3-tables [!m68k !sh4 !x32],
                xvfb, xauth, xclip,
+               python-ipykernel, python3-ipykernel,
+               python-lzma
 Build-Depends-Indep:
  ipython (>= 0.12) | ipython2x | ipython1x,
 Build-Conflicts: python-tables (= 3.3.0-4), python3-tables (= 3.3.0-4)
diff -Nru pandas-0.22.0/debian/rules pandas-0.22.0/debian/rules
--- pandas-0.22.0/debian/rules	2018-05-29 11:12:00.000000000 +0000
+++ pandas-0.22.0/debian/rules	2018-06-05 04:55:32.000000000 +0000
@@ -96,6 +96,18 @@
 	[ "$(UVER)" = "`cat debian/cythonized-files/VERSION`" ]
 	rm -rf build doc/_build *-stamp # pandas.egg-info pandas/datasets/__config__.py
 	dh_clean
+	rm -rf doc/source/generated
+	rm -rf doc/build
+	rm -f doc/source/_static/basic.html
+	rm -f doc/source/_static/columns.html
+	rm -f doc/source/_static/escape.html
+	rm -f doc/source/_static/float_format.html
+	rm -f doc/source/_static/nobold.html
+	rm -f doc/source/_static/noescape.html
+	rm -f doc/source/index.rst
+	rm -f doc/source/templates/myhtml.tpl
+	rm -f pandas/__version.py
+
 
 version_py:
 	[ -e pandas/__version.py ] || \
@@ -121,7 +133,7 @@
 	python$* setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp
 
 python-test%: python-install%
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	echo "backend : Agg" >| $(CURDIR)/build/matplotlibrc
 	: # Run unittests here against installed pandas
 	echo "$*" | grep -q '^3' && PY=3 || PY=$*; \
@@ -136,7 +148,7 @@
 
 override_dh_installdocs:
 	: # Build Documentation using installed pandas
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+ifeq (docdisabled,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 ifneq (,$(findstring -a,$(DH_INTERNAL_OPTIONS)))
 	: # not building documentation in -a
 else