diff -Nru qscintilla2-2.10.4+dfsg/debian/changelog qscintilla2-2.10.4+dfsg/debian/changelog
--- qscintilla2-2.10.4+dfsg/debian/changelog	2019-06-16 12:55:29.000000000 +0000
+++ qscintilla2-2.10.4+dfsg/debian/changelog	2019-06-18 09:24:35.000000000 +0000
@@ -1,3 +1,10 @@
+qscintilla2 (2.10.4+dfsg-2.1+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.10.2+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 11 Jan 2018 16:07:42 +0000]
+  * Add symbols file hack for Raspbian.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Jun 2019 09:24:35 +0000
+
 qscintilla2 (2.10.4+dfsg-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru qscintilla2-2.10.4+dfsg/debian/rules qscintilla2-2.10.4+dfsg/debian/rules
--- qscintilla2-2.10.4+dfsg/debian/rules	2019-02-21 18:34:03.000000000 +0000
+++ qscintilla2-2.10.4+dfsg/debian/rules	2019-06-18 09:24:35.000000000 +0000
@@ -41,6 +41,10 @@
 
 configure-stamp:
 	dh_testdir
+	sed -i 's/(arch=armel)/(optional=meh)/' debian/libqscintilla2-qt4-13.symbols
+	sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqscintilla2-qt4-13.symbols
+	sed -i 's/(arch=armel)/(optional=meh)/' debian/libqscintilla2-qt5-13.symbols
+	sed -i 's/(arch=!armel)/(optional=meh2)/' debian/libqscintilla2-qt5-13.symbols
 	mkdir QSciQt4
 	cp -r Qt4Qt5/* QSciQt4
 	mkdir designer-Qt4
@@ -136,6 +140,10 @@
 	rm -f *-stamp
 
 	dh_clean
+	sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt4-13.symbols
+	sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt4-13.symbols
+	sed -i 's/(optional=meh)/(arch=armel)/' debian/libqscintilla2-qt5-13.symbols
+	sed -i 's/(optional=meh2)/(arch=!armel)/' debian/libqscintilla2-qt5-13.symbols
 
 d3_qt4_dbg = debian/python3-pyqt4.qsci-dbg
 d3_qt5_dbg = debian/python3-pyqt5.qsci-dbg