From: David Bremner Date: Tue, 21 Jun 2011 01:00:44 +0000 (-0300) Subject: debian: split off emacs interface into its own package. X-Git-Tag: debian/0.6_254~3 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6f3d3c68a0f36325ec29b8196ee9b956bcd31a37 debian: split off emacs interface into its own package. - rename emacsen-install/remove files, and change embedded package name - split notmuch.install, notmuch.dirs - add Breaks/Replaces for previous notmuch packages with overlapping files. --- diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian new file mode 100644 index 00000000..69477542 --- /dev/null +++ b/debian/NEWS.Debian @@ -0,0 +1,7 @@ +notmuch (0.6~238) unstable; urgency=low + + The emacs user interface to notmuch is now contained in a seperate + package called notmuch-emacs. + + -- David Bremner Mon, 20 Jun 2011 23:57:55 -0300 + diff --git a/debian/control b/debian/control index 8288e3b1..77682b50 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Dm-Upload-Allowed: yes Package: notmuch Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Enhances: emacs, vim -Suggests: emacs, vim, vim-addon-manager +Enhances: vim +Suggests: vim, vim-addon-manager Description: thread-based email index, search and tagging Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses @@ -25,7 +25,7 @@ Description: thread-based email index, search and tagging convenient search syntax. . This package contains the notmuch command-line interface as well as - emacs and vim interfaces for notmuch. + the vim interface for notmuch. Package: libnotmuch1 Section: libs @@ -65,3 +65,20 @@ Description: python interface to the notmuch mail search and index library . This package provides a Python interface to the notmuch functionality, directly interfacing with a shared notmuch library. + +Package: notmuch-emacs +Architecture: all +Section: mail +Breaks: notmuch (<<0.6~238~) +Replaces: notmuch (<<0.6~238~) +Depends: ${misc:Depends}, notmuch, + emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) +Description: thread-based email index, search and tagging (emacs interface) + Notmuch is a system for indexing, searching, reading, and tagging + large collections of email messages in maildir or mh format. It uses + the Xapian library to provide fast, full-text search with a very + convenient search syntax. + . + This package provides an emacs based mail user agent based on + notmuch. + diff --git a/debian/notmuch-emacs.dirs b/debian/notmuch-emacs.dirs new file mode 100644 index 00000000..caeb4003 --- /dev/null +++ b/debian/notmuch-emacs.dirs @@ -0,0 +1 @@ +usr/share/emacs/site-lisp/notmuch diff --git a/debian/notmuch-emacs.emacsen-install b/debian/notmuch-emacs.emacsen-install new file mode 100755 index 00000000..8fd30276 --- /dev/null +++ b/debian/notmuch-emacs.emacsen-install @@ -0,0 +1,47 @@ +#! /bin/sh -e +# /usr/lib/emacsen-common/packages/install/notmuch-emacs + +# Written by Jim Van Zandt , borrowing heavily +# from the install scripts for gettext by Santiago Vila +# and octave by Dirk Eddelbuettel . + +FLAVOR=$1 +PACKAGE=notmuch + +if [ ${FLAVOR} = emacs ]; then exit 0; fi + +# We know that the notmuch emacs code doesn't work with emacs before emacs23 +if [ ${FLAVOR} = emacs21 ]; then exit 0; fi +if [ ${FLAVOR} = emacs22 ]; then exit 0; fi +if [ ${FLAVOR} = xemacs21 ]; then exit 0; fi +if [ ${FLAVOR} = xemacs22 ]; then exit 0; fi + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + +#FLAVORTEST=`echo $FLAVOR | cut -c-6` +#if [ ${FLAVORTEST} = xemacs ] ; then +# SITEFLAG="-no-site-file" +#else +# SITEFLAG="--no-site-file" +#fi +#FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" +FLAGS="--no-site-file -q -batch -l path.el -f batch-byte-compile" + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +install -m 755 -d ${ELCDIR} +cd ${ELDIR} +FILES=`echo *.el` +cd ${ELCDIR} +for file in ${FILES}; do + ln -sf ${ELDIR}/${file} . +done + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} ${FILES} +rm -f *.el + +exit 0 diff --git a/debian/notmuch-emacs.emacsen-remove b/debian/notmuch-emacs.emacsen-remove new file mode 100755 index 00000000..184c2b60 --- /dev/null +++ b/debian/notmuch-emacs.emacsen-remove @@ -0,0 +1,10 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/notmuch-emacs + +FLAVOR=$1 +PACKAGE=notmuch + +if [ ${FLAVOR} != emacs ]; then + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} +fi diff --git a/debian/notmuch-emacs.install b/debian/notmuch-emacs.install new file mode 100644 index 00000000..c73aecef --- /dev/null +++ b/debian/notmuch-emacs.install @@ -0,0 +1 @@ +usr/share/emacs/site-lisp/notmuch/*.el diff --git a/debian/notmuch.dirs b/debian/notmuch.dirs index ce7f2393..4b4ce9ea 100644 --- a/debian/notmuch.dirs +++ b/debian/notmuch.dirs @@ -1,5 +1,4 @@ usr/bin -usr/share/emacs/site-lisp/notmuch usr/share/vim/registry usr/share/vim/addons/plugin usr/share/vim/addons/syntax diff --git a/debian/notmuch.emacsen-install b/debian/notmuch.emacsen-install deleted file mode 100755 index 98ec1282..00000000 --- a/debian/notmuch.emacsen-install +++ /dev/null @@ -1,47 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/notmuch - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=notmuch - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -# We know that the notmuch emacs code doesn't work with emacs before emacs23 -if [ ${FLAVOR} = emacs21 ]; then exit 0; fi -if [ ${FLAVOR} = emacs22 ]; then exit 0; fi -if [ ${FLAVOR} = xemacs21 ]; then exit 0; fi -if [ ${FLAVOR} = xemacs22 ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -#FLAVORTEST=`echo $FLAVOR | cut -c-6` -#if [ ${FLAVORTEST} = xemacs ] ; then -# SITEFLAG="-no-site-file" -#else -# SITEFLAG="--no-site-file" -#fi -#FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" -FLAGS="--no-site-file -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cd ${ELCDIR} -for file in ${FILES}; do - ln -sf ${ELDIR}/${file} . -done - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el - -exit 0 diff --git a/debian/notmuch.emacsen-remove b/debian/notmuch.emacsen-remove deleted file mode 100755 index c35e8a42..00000000 --- a/debian/notmuch.emacsen-remove +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/notmuch - -FLAVOR=$1 -PACKAGE=notmuch - -if [ ${FLAVOR} != emacs ]; then - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff --git a/debian/notmuch.install b/debian/notmuch.install index dd310fad..5b7de1be 100644 --- a/debian/notmuch.install +++ b/debian/notmuch.install @@ -1,5 +1,4 @@ usr/bin -usr/share/emacs/site-lisp/notmuch/*.el usr/share/man/man1 etc/bash_completion.d usr/share/zsh