diff -Nru libcec-4.0.4+dfsg1/debian/changelog libcec-4.0.4+dfsg1/debian/changelog
--- libcec-4.0.4+dfsg1/debian/changelog	2019-03-08 12:21:44.000000000 +0000
+++ libcec-4.0.4+dfsg1/debian/changelog	2019-03-18 13:16:14.000000000 +0000
@@ -1,3 +1,16 @@
+libcec (4.0.4+dfsg1-2+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 3.1.0+dfsg1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 10 Mar 2016 00:53:26 +0000]
+  * Add symbols file hack for raspbian.
+  * Fix clean target.
+
+  [changes introduced in 4.0.3+dfsg1-1+rpi1 by Peter Michael Green]
+  * Add build-conflicts on libpython3 dev packages, if they are installed
+    this package will pick them in preference to 2.7 resulting in
+    missing files.
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Mar 2019 13:16:14 +0000
+
 libcec (4.0.4+dfsg1-2) unstable; urgency=medium
 
   [ Balint Reczey ]
diff -Nru libcec-4.0.4+dfsg1/debian/control libcec-4.0.4+dfsg1/debian/control
--- libcec-4.0.4+dfsg1/debian/control	2019-03-08 12:21:44.000000000 +0000
+++ libcec-4.0.4+dfsg1/debian/control	2019-03-18 13:16:14.000000000 +0000
@@ -16,6 +16,7 @@
                libxrandr-dev,
                x11proto-core-dev,
                libncurses5-dev
+Build-Conflicts: libpython3.0-dev, libpython3.1-dev, libpython3.2-dev, libpython3.3-dev, libpython3.4-dev, libpython3.5-dev, libpython3.6-dev, libpython3.7-dev, libpython3.8-dev, libpython3.9-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://salsa.debian.org/debian/libcec
 Vcs-Git: https://salsa.debian.org/debian/libcec.git
diff -Nru libcec-4.0.4+dfsg1/debian/rules libcec-4.0.4+dfsg1/debian/rules
--- libcec-4.0.4+dfsg1/debian/rules	2019-03-08 12:21:44.000000000 +0000
+++ libcec-4.0.4+dfsg1/debian/rules	2019-03-18 13:16:14.000000000 +0000
@@ -8,6 +8,7 @@
 	dh  $@ --with python2
 
 override_dh_auto_configure:
+	sed -i 's/(arch=!armel !riscv64)/(optional=raspbian)/' debian/libcec*.symbols
 	ln -s /usr/include/cec-platform include/platform && \
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		-DHAVE_EXYNOS_API=1 \
@@ -17,3 +18,13 @@
 	dh_auto_install
 	rm debian/tmp/usr/bin/cec-client
 	mv debian/tmp/usr/bin/cec-client-* debian/tmp/usr/bin/cec-client
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f include/platform
+	rm -f include/version.h
+	rm -f src/cec-client/env.h
+	rm -f src/cecc-client/env.h
+	rm -f src/libcec/env.h
+	rm -f src/libcec/libcec.pc
+	sed -i 's/(optional=raspbian)/(arch=!armel !riscv64)/' debian/libcec*.symbols