lisp/info.el | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 prefer /usr/share/info/emacs/

Emacs prefers /usr/share/info/emacs to /usr/share/info.

The value of Info-default-directory-list has been augmented via
lisp/info.el to include /usr/share/info/emacs before /usr/share/info.

lisp/startup.el | 21 19 + 2 - 0 !
1 file changed, 19 insertions(+), 2 deletions(-)

 run debian-startup and set debian-emacs-flavor

Emacs runs debian-startup and sets debian-emacs-flavor.

* Emacs runs debian-startup during the startup process unless
  site-run-file is false.

* The global variable debian-emacs-flavor is bound to 'emacs.

Makefile.in | 44 17 + 27 - 0 !
admin/update_autogen | 3 1 + 2 - 0 !
configure.ac | 15 6 + 9 - 0 !
doc/misc/Makefile.in | 43 5 + 38 - 0 !
lisp/help.el | 8 8 + 0 - 0 !
5 files changed, 37 insertions(+), 76 deletions(-)

 remove files that appear to be incompatible with the dfsg

Files that appear to be incompatible with the DFSG have been removed.

A number of files have been removed from this package because their
licenses are not compatible with the Debian Free Software Guidelines
(DFSG), or because it wasn't completely clear that their licenses are
compatible.

In particular, all of the files which are covered under the GFDL and
have invariant sections have been removed in accordance with this
General Resolution: http://www.debian.org/vote/2006/vote_001.

The files that have been removed, but still appear to be
distributable, have been moved to packages in Debian's non-free
section.

etc/NEWS | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 adjust documentation references for debian

Various documentation references have been adjusted for Debian.

References to /usr/local/... have been changed to /usr/... as
appropriate, etc.

lisp/version.el | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 modify the output of (version) to indicate debian modifications

The output of (version) has been modified to indicate Debian modifications.

admin/unidata/Makefile.in | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 don't try to build src/macuvs.h (via ivd_sequences.txt)

These are OS X specific, and were removed for now, due to uncertainty
over the licensing.

test/lisp/emacs-lisp/package-tests.el | 9 8 + 1 - 0 !
1 file changed, 8 insertions(+), 1 deletion(-)

 kill gpg agent in package-test.el to avoid a race

package-test.el should no longer fail during clean up.

* Previously a delete-directories call raced with the gpg agent's own
  cleanup process (presumably triggered by the first deletion of one of
  the agent's sockets).  As a result, it looks like the agent might
  delete one of its sockets after delete-directories had decided to
  delete the socket, but before it made the attempt, causing an
  exception.

* To fix the problem, explicitly ask gpg-connect-agent to kill the agent
  before attempting to delete the gnupg home directory, and then delete
  via "rm -rf" to ignore any vanishing files.

test/lisp/progmodes/elisp-mode-tests.el | 8 6 + 2 - 0 !
1 file changed, 6 insertions(+), 2 deletions(-)

 don't downcase real xref in elisp-mode-tests

The elisp-mode-tests should no longer fail on case sensitive
filesystems when the build path contains uppercase characters.

Previously the code was downcasing the path for both comparison and
lookups.

test/lisp/epg-tests.el | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 an epg test failure with recent gnupg versions has been fixed

This patch has been backported from upstream to fix m68k build
failures:

  Fix an epg test for recent GnuPG versions (bug#33439)

  * test/lisp/epg-tests.el (epg-decrypt-1):
  Tell recent GnuPG (e.g. 2.2.11) not to worry about missing MDC.

test/lisp/vc/vc-bzr-tests.el | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 mark vc-bzr-test-fauilt-bzr-autoloads as unstable for now

Currently the test fails like this:

  Running 3 tests (2018-12-17 12:17:43-0600)
     passed  1/3  vc-bzr-test-bug9726
  Mark set
  Press C-c C-c when you are done editing.
  Enter a change comment.  Type C-c C-c when done
     passed  2/3  vc-bzr-test-bug9781
  Falling back on "slow" status detection ((file-missing "Opening input file" "No such file or directory" "/tmp/vc-bzr-testVlgmsb/bzr/.bzr/checkout/dirstate"))
  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''

  Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)")
  Warnings in `bzr' output: bzr: ERROR: invalid header line: ''

  Test vc-bzr-test-faulty-bzr-autoloads backtrace:
    logand(nil 128)
    vc-mode-line("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el" Bzr)
    vc-refresh-state()
    run-hooks(find-file-hook)
    after-find-file(t t)
    find-file-noselect-1(#<buffer loaddefs.el> "/tmp/vc-bzr-testVlgmsb/b
    find-file-noselect("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el")
    autoload-find-generated-file()
    update-directory-autoloads("/tmp/vc-bzr-testVlgmsb/bzr/")
    (progn (update-directory-autoloads default-directory) t)
    (setq value-35 (progn (update-directory-autoloads default-directory)
    (unwind-protect (setq value-35 (progn (update-directory-autoloads de
    (if (unwind-protect (setq value-35 (progn (update-directory-autoload
    (let (form-description-36) (if (unwind-protect (setq value-35 (progn
    (let ((value-35 (gensym "ert-form-evaluation-aborted-"))) (let (form
    (progn (call-process vc-bzr-program nil nil nil "init") (let ((temp-
    (unwind-protect (progn (call-process vc-bzr-program nil nil nil "ini
    (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-fi
    (lambda nil (let* ((fn-30 (function executable-find)) (args-31 (cond
    ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test
    ert-run-test(#s(ert-test :name vc-bzr-test-faulty-bzr-autoloads :doc
    ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi
    ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co
    ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable)))
    ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un
    eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) (
    command-line-1(("-L" ":/home/locke/tmp/main-26.1/debian/build-src/te
    command-line()
    normal-top-level()
  Test vc-bzr-test-faulty-bzr-autoloads condition:
      (wrong-type-argument number-or-marker-p nil)
     FAILED  3/3  vc-bzr-test-faulty-bzr-autoloads

  Ran 3 tests, 2 results as expected, 1 unexpected (2018-12-17 12:17:46-0600)

  1 unexpected results:
     FAILED  vc-bzr-test-faulty-bzr-autoloads

test/lisp/net/tramp-tests.el | 5 3 + 2 - 0 !
1 file changed, 3 insertions(+), 2 deletions(-)

 tramp-test42-remote-load-path: regexp-quote directory

Otherwise the test may fail for some paths like those seen in a Debian
sbuild chroot, e.g. build/emacs-i87jK3/emacs-26.1+1/...

test/lisp/ibuffer-tests.el | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 ibuffer-filter-inclusion-3: regexp-quote directory

Otherwise the test may fail for some paths like those seen in a Debian
sbuild chroot, e.g. build/emacs-i87jK3/emacs-26.1+1/...

test/lisp/net/network-stream-tests.el | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 mark echo-server-with-dns test as :unstable for now

It fails inside a Debian sbuild chroot.

test/lisp/eshell/em-ls-tests.el | 9 8 + 1 - 0 !
1 file changed, 8 insertions(+), 1 deletion(-)

 fix an eshell ls dired test for non-recent files

* test/lisp/eshell/em-ls-tests.el (em-ls-test-bug27844):
Work around an eshell issue with non-recent files.  (Bug#33734)

lisp/gnus/mml-sec.el | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 avoid elisp crash for openpgp user ids with no e-mail address

* lisp/gnus/mml-sec.el (mml-secure-check-user-id): Verify that
there is an e-mail address in the current User ID before trying
to downcase it.  (Bug#34121)

Copyright-paperwork-exempt: yes