diff -Nru qtdeclarative-opensource-src-5.4.2/debian/changelog qtdeclarative-opensource-src-5.4.2/debian/changelog --- qtdeclarative-opensource-src-5.4.2/debian/changelog 2015-07-24 17:08:39.000000000 +0000 +++ qtdeclarative-opensource-src-5.4.2/debian/changelog 2015-08-02 03:45:26.000000000 +0000 @@ -1,3 +1,16 @@ +qtdeclarative-opensource-src (5.4.2-4+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 5.3.2-4+rpi1 by Peter Michael Green at Fri, 03 Oct 2014 08:10:59 +0000] + * Fix clean target. + + [changes introduced in 5.4.2-3+rpi1 by Peter Michael Green at Thu, 02 Jul 2015 17:57:48 +0000] + * Use sed to replace "arch=amd64 armhf i386)" "with optional=meh)" in + debian/libqt5qml5.symbols . The symbols don't seem to appear in raspbian and + I doubt they are important (probablly some sort of template instantiation + or similar crap). + + -- Raspbian forward porter Sun, 02 Aug 2015 03:45:26 +0000 + qtdeclarative-opensource-src (5.4.2-4) unstable; urgency=medium * Backport avoid_calling_potentially_pure-virtual_method.patch to avoid diff -Nru qtdeclarative-opensource-src-5.4.2/debian/rules qtdeclarative-opensource-src-5.4.2/debian/rules --- qtdeclarative-opensource-src-5.4.2/debian/rules 2015-06-23 13:27:48.000000000 +0000 +++ qtdeclarative-opensource-src-5.4.2/debian/rules 2015-08-02 03:45:26.000000000 +0000 @@ -14,6 +14,8 @@ dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg override_dh_auto_configure: + #symbols file hack + sed -i 's/arch=amd64 armhf i386)/optional=meh)/' debian/libqt5qml5.symbols qmake override_dh_auto_build-indep: @@ -56,3 +58,18 @@ # Requires X so disabled for now override_dh_auto_test: + +override_dh_auto_clean: + #clean up crap left behind + dh_auto_clean + rm -rf doc + rm -f bin/qml* + rm -rf mkspecs + rm -rf lib + rm -rf examples/quick/tutorials/gettingStartedQml/imports + rm -f `find include/ -name '*Depends'` + rm -f tests/auto/headersclean/tst_headersclean.cpp + rm -f tests/auto/qml/qqmlmoduleplugin/imports/org/qtproject/AutoTestQmlNestedPluginType/libnestedPlugin.prl + rm -f debian/*.mps + #undo our symbols file hack + sed -i 's/optional=meh)/arch=amd64 armhf i386)/' debian/libqt5qml5.symbols