Merge version 2:0.148.2748+git97eaef2-1+rpi1 and 2:0.148.2795+gitaaa9aa8-1 to produce...

diff --cc debian/changelog
index 591519c20dcc87f2db3d66bf16b2534d2589dc89,eded2588ad531a572b07d6b34877dab03b425da9..24c41b27b4a60bb172edcae6a16a96111ab78878
--- 1/debian/changelog
--- 2/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 <root@raspbian.org>  Thu, 09 Feb 2017 14:48:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  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 <ricotz@ubuntu.com>  Wed, 28 Jun 2017 08:31:44 +0200
  
  x264 (2:0.148.2748+git97eaef2-1) unstable; urgency=medium