From: Raspbian forward pporter Date: Thu, 9 Feb 2017 14:48:08 +0000 (+0000) Subject: Merge version 2:0.148.2728+git4d5c8b0-1+rpi1 and 2:0.148.2748+git97eaef2-1 to produce... X-Git-Tag: archive/raspbian/2%0.148.2748+git97eaef2-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=656d99487ea2ab585ca6ffd5e02397ea27d5267d;p=x264.git Merge version 2:0.148.2728+git4d5c8b0-1+rpi1 and 2:0.148.2748+git97eaef2-1 to produce 2:0.148.2748+git97eaef2-1+rpi1 --- 656d99487ea2ab585ca6ffd5e02397ea27d5267d diff --cc debian/changelog index 54e9da6,3af1e0c..591519c --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,10 +1,20 @@@ - x264 (2:0.148.2728+git4d5c8b0-1+rpi1) stretch-staging; urgency=medium ++x264 (2:0.148.2748+git97eaef2-1+rpi1) stretch-staging; urgency=medium + + [Changes introduced in 2:0.142.2431+gita5831aa-1+rpi2 by Peter Michael Green] + * Revert previous raspbian changes (not all of which were mentioned + in the changelog, start again from debian source) + * Pass --disable-asm for static build to prevent it being + armv7/neon contaminated. + - -- Raspbian forward porter Wed, 21 Dec 2016 15:31:14 +0000 ++ -- Raspbian forward porter Thu, 09 Feb 2017 14:48:07 +0000 ++ + x264 (2:0.148.2748+git97eaef2-1) unstable; urgency=medium + + * Update to new stable upstream + * New upstream version 0.148.2748+git97eaef2 + * Regenerate manpage + + -- Rico Tzschichholz Wed, 25 Jan 2017 10:40:48 +0100 x264 (2:0.148.2728+git4d5c8b0-1) unstable; urgency=medium