fix debian packaging emacsen installation

3 files changed, 12 insertions, 25 deletions

diff --git a/debian/notmuch.emacsen-install b/debian/notmuch.emacsen-install
index 2611aed2..67602604 100644..100755
--- a/debian/notmuch.emacsen-install
+++ b/debian/notmuch.emacsen-install
@@ -18,28 +18,22 @@ echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
 #else
 #    SITEFLAG="--no-site-file"
 #fi
-FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+#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-info-altdir does not actually exist.
-# Maybe somebody will write it.
-if test -x /usr/sbin/install-info-altdir; then
-    echo install/${PACKAGE}: install Info links for ${FLAVOR}
-    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
-fi
-
 install -m 755 -d ${ELCDIR}
 cd ${ELDIR}
 FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
 cd ${ELCDIR}
+ln -sf ${ELDIR}/${FILES} ${ELCDIR}
 
 cat << EOF > path.el
 (setq load-path (cons "." load-path) byte-compile-warnings nil)
 EOF
 ${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+rm -f path.el
 
 exit 0
diff --git a/debian/notmuch.emacsen-remove b/debian/notmuch.emacsen-remove
index e19ee3da..c35e8a42 100644..100755
--- a/debian/notmuch.emacsen-remove
+++ b/debian/notmuch.emacsen-remove
@@ -5,11 +5,6 @@ FLAVOR=$1
 PACKAGE=notmuch
 
 if [ ${FLAVOR} != emacs ]; then
-    if test -x /usr/sbin/install-info-altdir; then
-        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/#PACKAGE#.info.gz
-    fi
-
     echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
     rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
 fi
diff --git a/debian/notmuch.emacsen-startup b/debian/notmuch.emacsen-startup
index 017938d5..73f387ec 100644
--- a/debian/notmuch.emacsen-startup
+++ b/debian/notmuch.emacsen-startup
@@ -1,21 +1,19 @@
 ;; -*-emacs-lisp-*-
 ;;
 ;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50notmuch.el
-;; for the Debian #PACKAGE# package
+;; for the Debian notmuch package
 ;;
 ;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
 ;; Modified by Dirk Eddelbuettel <edd@debian.org>
 ;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
 
-;; The #PACKAGE# package follows the Debian/GNU Linux 'emacsen' policy and
+;; 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.
-;; We have to add this to the load-path:
-(let ((package-dir (concat "/usr/share/"
-                           (symbol-name flavor)
-                           "/site-lisp/notmuch")))
-;; If package-dir does not exist, the notmuch package must have
-;; removed but not purged, and we should skip the setup.
-  (when (file-directory-p package-dir)
-    (setq load-path (cons package-dir load-path))
+
+(if (not (file-exists-p "/usr/share/emacs/site-lisp/notmuch"))
+    (message "Package notmuch removed but not purged.  Skipping setup.")
+  (debian-pkg-add-load-path-item
+   (concat
+    "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/notmuch"))