From 6354745dcd6505c5f12c185a29c25a8d1c240595 Mon Sep 17 00:00:00 2001 From: David Bremner <david@tethera.net> Date: Tue, 15 Aug 2017 07:52:47 -0300 Subject: [PATCH] debian: actually stop shipping 50notmuch.el --- debian/changelog | 8 ++++++++ debian/notmuch.emacsen-startup | 28 ---------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 debian/notmuch.emacsen-startup diff --git a/debian/changelog b/debian/changelog index d738d243..2fe8bbed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +notmuch (0.25-6) unstable; urgency=medium + + * Bug fix: "deletes shipped file on reinstall: + /etc/emacs/site-start.d/50notmuch.el", thanks to Andreas Beckmann + (Closes: #872197). + + -- David Bremner <bremner@debian.org> Tue, 15 Aug 2017 07:52:21 -0300 + notmuch (0.25-5) unstable; urgency=medium * Bug fix: "dependency on elpa-emacs doesn't seem right", thanks diff --git a/debian/notmuch.emacsen-startup b/debian/notmuch.emacsen-startup deleted file mode 100644 index 60bf9968..00000000 --- a/debian/notmuch.emacsen-startup +++ /dev/null @@ -1,28 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50notmuch.el -;; for the Debian notmuch package - -;; The notmuch package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. - -(cond - ((not (file-exists-p "/usr/share/emacs/site-lisp/notmuch")) - (message "Package notmuch removed but not purged. Skipping setup.")) - ((not (file-exists-p (concat "/usr/share/" - (symbol-name debian-emacs-flavor) - "/site-lisp/notmuch"))) - (message "Package notmuch not fully installed. Skipping setup.")) - (t - (debian-pkg-add-load-path-item - (concat "/usr/share/" - (symbol-name debian-emacs-flavor) - "/site-lisp/notmuch")) - (autoload 'notmuch "notmuch" "Run notmuch and display saved searches, known tags, etc." t) - (autoload 'notmuch-hello "notmuch" "Run notmuch and display saved searches, known tags, etc." t) - (autoload 'notmuch-search "notmuch" "Run \"notmuch search\" with the given query string and display results." t) - (autoload 'notmuch-show "notmuch" "Run \"notmuch show\" with the given thread ID and display results." t) - - )) -- 2.45.2