diff -Nru emacspeak-49.0+dfsg/debian/changelog emacspeak-49.0+dfsg/debian/changelog --- emacspeak-49.0+dfsg/debian/changelog 2019-01-15 20:52:21.000000000 +0000 +++ emacspeak-49.0+dfsg/debian/changelog 2019-02-10 19:51:25.000000000 +0000 @@ -1,3 +1,10 @@ +emacspeak (49.0+dfsg-3) unstable; urgency=medium + + * Add dont-break-on-vm-cruft.patch to avoid installation failure + (Closes: #921883) + + -- Paul Gevers Sun, 10 Feb 2019 20:51:25 +0100 + emacspeak (49.0+dfsg-2) unstable; urgency=medium [ Paul Gevers ] diff -Nru emacspeak-49.0+dfsg/debian/patches/dont-break-on-vm-cruft.patch emacspeak-49.0+dfsg/debian/patches/dont-break-on-vm-cruft.patch --- emacspeak-49.0+dfsg/debian/patches/dont-break-on-vm-cruft.patch 1970-01-01 00:00:00.000000000 +0000 +++ emacspeak-49.0+dfsg/debian/patches/dont-break-on-vm-cruft.patch 2019-02-10 19:51:25.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Don't trip over cruft left by vm + Somewhere before vm 8.2.0b-5, that package didn't clean up properly after + itself, causing emacspeak to fail during byte compiling. Avoid the failure. +Authors: hartmans and bremner on IRC +Bug-Debian: https://bugs.debian.org/921883 +Index: emacspeak/lisp/emacspeak-vm.el +=================================================================== +--- emacspeak.orig/lisp/emacspeak-vm.el ++++ emacspeak/lisp/emacspeak-vm.el +@@ -49,7 +49,7 @@ + ;;{{{ requires + (cl-declaim (optimize (safety 0) (speed 3))) + (require 'emacspeak-preamble) +-(require 'vm () 'no-error) ++(with-demoted-errors "Error loading VM: %s" (require 'vm () 'no-error)) + (require 'browse-url) + ;;}}} + ;;{{{ Forward Decls: diff -Nru emacspeak-49.0+dfsg/debian/patches/series emacspeak-49.0+dfsg/debian/patches/series --- emacspeak-49.0+dfsg/debian/patches/series 2019-01-15 20:52:21.000000000 +0000 +++ emacspeak-49.0+dfsg/debian/patches/series 2019-02-10 19:51:25.000000000 +0000 @@ -6,3 +6,4 @@ use-tclsh-as-interpreter-for-ssh-espeak.patch no-default-load-file-for-clojure 0001-Fix-non-advised-functions-not-to-use-ems-interactive.patch +dont-break-on-vm-cruft.patch