Merge version 25.2+1-5+rpi1 and 25.2+1-6 to produce 25.2+1-6+rpi1

diff --cc debian/changelog
index 83cf1be76668116666352eb6641d8c05c1435bfe,bc249be29e3874a499b0be315ccd876f12b41361..ec0acf81f91b92f94f21eee0fdf4026472733a59
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,12 +1,19 @@@
- emacs25 (25.2+1-5+rpi1) buster-staging; urgency=medium
++emacs25 (25.2+1-6+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 25.2+1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 18:29:59 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 17 Aug 2017 18:29:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Oct 2017 21:11:23 +0000
++
+ emacs25 (25.2+1-6) unstable; urgency=high
+ 
+   * Block remote code execution via enriched text.  Add
+     0012-A-remote-execution-exploit-via-enriched-text-has-bee.patch to
+     fix the problem.  Thanks to David Bremner for the alert and
+     Salvatore Bonaccorso for reporting the problem to Debian.
+     (Closes: 875447)
+ 
+  -- Rob Browning <rlb@defaultvalue.org>  Mon, 11 Sep 2017 21:51:49 -0500
  
  emacs25 (25.2+1-5) unstable; urgency=medium