Package: emacs / 1:27.1+1-3.1


Package Version Patches format
emacs 1:27.1+1-3.1 3.0 (quilt)

Patch series

view the series file
Patch File delta Description
0001 Prefer usr share info emacs.patch | (download)

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.

0002 Run debian startup and set debian emacs flavor.patch | (download)

lisp/startup.el | 13 12 + 1 - 0 !
1 file changed, 12 insertions(+), 1 deletion(-)

 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.

0003 Remove files that appear to be incompatible with the.patch | (download) | 44 17 + 27 - 0 !
admin/update_autogen | 3 1 + 2 - 0 ! | 15 6 + 9 - 0 !
doc/misc/ | 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

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:

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

0004 Adjust documentation references for Debian.patch | (download)

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.

0005 Modify the output of version to indicate Debian modi.patch | (download)

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.

0006 Don t try to build src macuvs.h via IVD_Sequences.tx.patch | (download)

admin/unidata/ | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 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.

0007 Kill gpg agent in package test.el to avoid a race.patch | (download)

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

* 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.

0008 Don t downcase real xref in elisp mode tests.patch | (download)

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

0009 Mark vc bzr test fauilt bzr autoloads as unstable fo.patch | (download)

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)
    after-find-file(t t)
    find-file-noselect-1(#<buffer loaddefs.el> "/tmp/vc-bzr-testVlgmsb/b
    (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
  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

0010 Mark echo server with dns test as unstable for now.patch | (download)

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.

0011 emacs module tests fix VPATH builds.patch | (download)

test/ | 2 1 + 1 - 0 !
test/src/emacs-module-tests.el | 11 6 + 5 - 0 !
2 files changed, 7 insertions(+), 6 deletions(-)

 emacs-module-tests: fix vpath builds

Add the actual srcdir to the MODULE_CFLAGS include path, and adjust
the module/describe-function-1 test to ignore the shared library path
prefix, which varies when building outside the source tree.

Status: new

0012 Strip parent path from package descriptions for repr.patch | (download)

lisp/emacs-lisp/package.el | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 strip parent path from package descriptions for reproducibility

Previously, the package description would include the full build tree
path which varies.  Instead, remove any duplicate slashes and any
components other than the immediate parent.

Thanks to Chris Lamb for reporting the problem and tracking down the


0013 Recover the contents of the schemas.xml file.patch | (download)

etc/schema/schemas.xml | 58 58 + 0 - 0 !
1 file changed, 58 insertions(+)

 recover the contents of the schemas.xml file

* etc/schema/schemas.xml: Recover the file, which was apparently
(mostly) removed by mistake by commit 165f738382 (bug#42851).

Copyright-paperwork-exempt: yes

0014 Skip tests that require Internet when there s no Int.patch | (download)

test/lisp/net/network-stream-tests.el | 20 20 + 0 - 0 !
test/src/process-tests.el | 26 19 + 7 - 0 !
2 files changed, 39 insertions(+), 7 deletions(-)

 skip tests that require internet when there's no internet


The network-stream-tests actually work fine when the local machine has
no IP at all, but cause a crash in the GnuTLS library when there is an
IP configured but the interface is down.

* test/lisp/net/network-stream-tests.el (internet-is-working): New
defvar, checks if we can resolve "".
(connect-to-tls-ipv4-nowait, connect-to-tls-ipv6-nowait)
(open-network-stream-tls-nowait, open-gnutls-stream-new-api-nowait)
(open-gnutls-stream-old-api-nowait): Use it to check for working
Internet access.

* test/src/process-tests.el (internet-is-working): New defvar, checks
if we can resolve "".
(lookup-family-specification, lookup-unicode-domains)
(unibyte-domain-name, lookup-google, non-existent-lookup-failure): Use
it to check for working Internet access.

XXX DEBIAN: This patch was adjusted to always consider that we don't
have internet available during tests.