diff -Nru qt4-x11-4.8.7+dfsg/debian/changelog qt4-x11-4.8.7+dfsg/debian/changelog --- qt4-x11-4.8.7+dfsg/debian/changelog 2016-05-29 19:48:13.000000000 +0000 +++ qt4-x11-4.8.7+dfsg/debian/changelog 2016-06-16 19:28:30.000000000 +0000 @@ -1,3 +1,10 @@ +qt4-x11 (4:4.8.7+dfsg-8+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 4:4.8.6+git64-g5dc8b2b+dfsg-2+rpi1 by Peter Micheal Green at Thu, 31 Jul 2014 22:56:54 +0000] + * Disable neon + + -- Raspbian forward porter Thu, 16 Jun 2016 19:28:30 +0000 + qt4-x11 (4:4.8.7+dfsg-8) unstable; urgency=medium [ Pino Toscano ] diff -Nru qt4-x11-4.8.7+dfsg/debian/rules qt4-x11-4.8.7+dfsg/debian/rules --- qt4-x11-4.8.7+dfsg/debian/rules 2016-05-29 19:30:32.000000000 +0000 +++ qt4-x11-4.8.7+dfsg/debian/rules 2016-06-16 19:28:30.000000000 +0000 @@ -51,7 +51,7 @@ armv6_architectures := armhf ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures))) - extra_configure_opts += -arch armv6 + extra_configure_opts += -arch armv6 -no-neon endif ifeq ($(vendor),Ubuntu)