debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

uploaded to Debian unstable

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQGcBAABCAAGBQJS0yuYAAoJEPIClx2kp54s6HAL/RbxzE1sHhjRHwq8j2aTskGZ
 Qd02bgQSxJN2eIE1SzTc0XKCJkY13R1ZZ0cEgsgrBQg9OIlyYFZYcReD6Cg0CFUk
 BGH+RSrfULMuzo2Q9c69JkpVJXPOBl0Jp37a91+a3WwbCZSFNaxRqSWLaqt7ZYJW
 ucYWPHAo32c7Fwe+4obXXzoB7ZClDCyv/3R4EZ93gTUbePKKRSs3MUGv81v0HBXF
 jgdZuUs63b8eGJyFyWazOY6mlenCB9tS2UwcSnRl2JzWcxfPk/2HEhKUs8DAwwc1
 pa14uwzCNYyxlYPUJnyt8aoFZC9/YIgxlA8emrUEgnSyBDoRupO1g9RP/CRtzs1X
 92g/asrq6lKIziU0mx9qGp+Dm4++SfU7OekTamSYTKCsqrKHBbe1KavG6SGUzIto
 BZ6g/QXdpGuPvYfBRs51kzLnl9+IP9lTHGiD4u/Njz9GcCA5PuIq4Vygwmi3vF1r
 RApE3d8QpkNcLSKzuR9Kb7N3N2OWbqNJCuArNsvxJw==
 =Y3L3
 -----END PGP SIGNATURE-----

Merge tag 'debian/0.17-3'

uploaded to Debian unstable
This commit is contained in:
David Bremner 2014-01-12 19:56:25 -04:00
commit 79b6b0190b
9 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
notmuch (0.17-3) unstable; urgency=medium
* update notmuch-emacs for debian emacs policy 2.0.6
* Update emacs test suite for Hurd compatibility
-- David Bremner <bremner@debian.org> Sun, 12 Jan 2014 17:07:16 -0400
notmuch (0.17-2) unstable; urgency=medium notmuch (0.17-2) unstable; urgency=medium
* Bug fix: "package should warn in a NEWS.Debian file about possible * Bug fix: "package should warn in a NEWS.Debian file about possible

1
debian/control vendored
View file

@ -108,6 +108,7 @@ Architecture: all
Section: mail Section: mail
Breaks: notmuch (<<0.6~254~) Breaks: notmuch (<<0.6~254~)
Replaces: notmuch (<<0.6~254~) Replaces: notmuch (<<0.6~254~)
Conflicts: emacsen-common (<< 2.0.0)
Depends: ${misc:Depends}, notmuch (>= ${source:Version}), Depends: ${misc:Depends}, notmuch (>= ${source:Version}),
emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) | emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) |
emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~) emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~)

1
debian/notmuch-emacs.emacsen-compat vendored Normal file
View file

@ -0,0 +1 @@
0

2
debian/notmuch-emacs.emacsen-install vendored
View file

@ -8,8 +8,6 @@
FLAVOR=$1 FLAVOR=$1
PACKAGE=notmuch PACKAGE=notmuch
if [ ${FLAVOR} = emacs ]; then exit 0; fi
# We know that the notmuch emacs code doesn't work with emacs before emacs23 # We know that the notmuch emacs code doesn't work with emacs before emacs23
if [ ${FLAVOR} = emacs21 ]; then exit 0; fi if [ ${FLAVOR} = emacs21 ]; then exit 0; fi
if [ ${FLAVOR} = emacs22 ]; then exit 0; fi if [ ${FLAVOR} = emacs22 ]; then exit 0; fi

6
debian/notmuch-emacs.emacsen-remove vendored
View file

@ -4,7 +4,5 @@
FLAVOR=$1 FLAVOR=$1
PACKAGE=notmuch PACKAGE=notmuch
if [ ${FLAVOR} != emacs ]; then echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
fi

4
debian/notmuch-emacs.postinst vendored Normal file
View file

@ -0,0 +1,4 @@
dir="/var/lib/emacsen-common/state/package/installed"
mkdir -p 0755 ${dir}
touch ${dir}/notmuch-emacs
#DEBHELPER#

3
debian/notmuch-emacs.prerm vendored Normal file
View file

@ -0,0 +1,3 @@
#DEBHELPER#
dir="/var/lib/emacsen-common/state/package/installed"
rm -f ${dir}/notmuch-emacs

1
debian/source/options vendored Normal file
View file

@ -0,0 +1 @@
single-debian-patch

15
test/test-lib.el
View file

@ -77,19 +77,22 @@ invisible text."
(setq start next-pos))) (setq start next-pos)))
str)) str))
;; process-attributes is not defined everywhere, so define an
;; alternate way to test if a process still exists.
(defun test-process-running (pid)
(= 0
(signal-process pid 0)))
(defun orphan-watchdog-check (pid) (defun orphan-watchdog-check (pid)
"Periodically check that the process with id PID is still "Periodically check that the process with id PID is still
running, quit if it terminated." running, quit if it terminated."
(if (not (process-attributes pid)) (if (not (test-process-running pid))
(kill-emacs))) (kill-emacs)))
(defun orphan-watchdog (pid) (defun orphan-watchdog (pid)
"Initiate orphan watchdog check." "Initiate orphan watchdog check."
; If process-attributes returns nil right away, that probably means (run-at-time 60 60 'orphan-watchdog-check pid))
; it is unimplimented. So we delay two minutes before killing emacs.
(if (process-attributes pid)
(run-at-time 60 60 'orphan-watchdog-check pid)
(run-at-time 120 60 'orphan-watchdog-check pid)))
(defun hook-counter (hook) (defun hook-counter (hook)
"Count how many times a hook is called. Increments "Count how many times a hook is called. Increments