Merge version 1:25.2+1-11+rpi1 and 1:26.1+1-3 to produce 1:26.1+1-3+rpi1

diff --cc debian/changelog
index 87cd3d0b51a7d35017ffa27d1862dae9660cfabb,3098969f877b2e59e2081b69042006c7d451ef2e..5d20fa7d703a6a415d85f8a44d6338cba9bba2cf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,55 +1,62 @@@
- emacs (1:25.2+1-11+rpi1) buster-staging; urgency=medium
++emacs (1:26.1+1-3+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from emacs25 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>  Fri, 14 Sep 2018 11:26:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Jan 2019 23:05:43 +0000
++
+ emacs (1:26.1+1-3) unstable; urgency=medium
+ 
+   * Recommend mailutils instead of depending on it.
+     (Closes: 917245, 916986)
+ 
+  -- Rob Browning <rlb@defaultvalue.org>  Wed, 26 Dec 2018 13:54:16 -0600
+ 
+ emacs (1:26.1+1-2) unstable; urgency=medium
+ 
+   * Update emacs metapackage to depend on >= 1:26.1.
+ 
+   * Enable support for systemd socket activation.  Thanks to Ansgar
+     Burchardt for the report. (Closes: 916760)
+ 
+  -- Rob Browning <rlb@defaultvalue.org>  Thu, 20 Dec 2018 10:49:20 -0600
+ 
+ emacs (1:26.1+1-1) experimental; urgency=medium
+ 
+   * Merge upstream version 26.1.
+ 
+   * Update debian/copyright version for 26.1.
+ 
+   * Use more secure mailutils instead of internal movemail.  See the
+     26.1 NEWS for more information.
+ 
+   * Add debian/copyright entries for 26.1.
+ 
+   * Fix epg-tests with upstream patch for newer GnuPG.  Add
+     0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch to
+     fix the problem.
+ 
+   * Mark the vc-bzr-test-faulty-bzr-autoloads as unstable for now.
+     Add 0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch to
+     disable the test for now.  See the patch header for a description
+     of the error.
+ 
+   * tramp-test42-remote-load-path: regexp-quote directory.  Add
+     0011-tramp-test42-remote-load-path-regexp-quote-directory.patch to
+     fix the problem.  Otherwise the test may fail for some paths like
+     those seen in an sbuild chroot,
+     e.g. build/emacs-i87jK3/emacs-26.1+1/...
+ 
+   * ibuffer-filter-inclusion-3: regexp-quote directory.  Add
+     0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch to
+     fix the problem.  Otherwise the test may fail for some paths like
+     those seen in an sbuild chroot,
+     e.g. build/emacs-i87jK3/emacs-26.1+1/...
+ 
+   * Mark echo-server-with-dns test as :unstable for now.  It fails
+     inside a Debian sbuild chroot.
+ 
+  -- Rob Browning <rlb@defaultvalue.org>  Mon, 17 Dec 2018 16:41:12 -0600
  
  emacs (1:25.2+1-11) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge