From: Raspbian forward pporter Date: Thu, 6 Jul 2017 20:44:46 +0000 (+0100) Subject: Merge version 2:0.148.2748+git97eaef2-1+rpi1 and 2:0.148.2795+gitaaa9aa8-1 to produce... X-Git-Tag: archive/raspbian/2%0.148.2795+gitaaa9aa8-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4d6e2b0a2085b81ea8090db34562beb4feb6de31;p=x264.git Merge version 2:0.148.2748+git97eaef2-1+rpi1 and 2:0.148.2795+gitaaa9aa8-1 to produce 2:0.148.2795+gitaaa9aa8-1+rpi1 --- 4d6e2b0a2085b81ea8090db34562beb4feb6de31 diff --cc debian/changelog index 591519c,eded258..24c41b2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,15 +1,25 @@@ - x264 (2:0.148.2748+git97eaef2-1+rpi1) stretch-staging; urgency=medium ++x264 (2:0.148.2795+gitaaa9aa8-1+rpi1) buster-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 Thu, 09 Feb 2017 14:48:07 +0000 ++ -- Raspbian forward porter Thu, 06 Jul 2017 20:44:46 +0000 ++ + x264 (2:0.148.2795+gitaaa9aa8-1) unstable; urgency=medium + + [ Rico Tzschichholz ] + * Update to new stable upstream + * New upstream version 0.148.2795+gitaaa9aa8 + * Regenerate manpage + * Update copyright years + + [ Sebastian Ramacher ] + * debian/control: Bump Standards-Version. + + -- Rico Tzschichholz Wed, 28 Jun 2017 08:31:44 +0200 x264 (2:0.148.2748+git97eaef2-1) unstable; urgency=medium