diff -Nru qscintilla2-2.10.4+dfsg/debian/changelog qscintilla2-2.10.4+dfsg/debian/changelog --- qscintilla2-2.10.4+dfsg/debian/changelog 2019-02-21 18:34:03.000000000 +0000 +++ qscintilla2-2.10.4+dfsg/debian/changelog 2019-03-05 18:20:32.000000000 +0000 @@ -1,3 +1,10 @@ +qscintilla2 (2.10.4+dfsg-2+rpi1) buster-staging; urgency=medium + + [changes brought forward from 2.10.2+dfsg-4+rpi1 by Peter Michael Green at Thu, 11 Jan 2018 16:07:42 +0000] + * Add symbols file hack for Raspbian. + + -- Raspbian forward porter Tue, 05 Mar 2019 18:20:32 +0000 + qscintilla2 (2.10.4+dfsg-2) unstable; urgency=medium [ Scott Kitterman ] 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-03-05 18:20:32.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