The following commit has been merged in the master branch: commit 450df027933b58a030c997f498f3db19a644fcc4 Author: Romain Beauxis <to...@rastageeks.org> Date: Tue May 14 07:20:34 2013 -0500
Updated emacsen files. diff --git a/debian/emacsen-remove b/debian/emacsen-remove deleted file mode 100644 index c979e02..0000000 --- a/debian/emacsen-remove +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/liquidsoap-mode - -FLAVOR=$1 -PACKAGE=liquidsoap-mode - -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/info/liquidsoap-mode.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/emacsen-startup b/debian/emacsen-startup deleted file mode 100644 index c57e1ed..0000000 --- a/debian/emacsen-startup +++ /dev/null @@ -1,22 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file for the Debian GNU/Linux liquidsoap-mode package -;; -;; Originally contributed by Nils Naumann <naum...@unileoben.ac.at> -;; Modified by Dirk Eddelbuettel <e...@debian.org> -;; Adapted for dh-make by Jim Van Zandt <j...@vanzandt.mv.com> - -;; The liquidsoap-mode 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/liquidsoap-mode"))) - (when (file-directory-p package-dir) - (setq load-path (cons package-dir load-path)) - (autoload 'liquidsoap-mode "liquidsoap-mode" "Liquidsoap editing mode." t) - (setq auto-mode-alist - (cons (cons "\\.t$" 'liquidsoap-mode) - auto-mode-alist)))) diff --git a/debian/emacsen-install b/debian/liquidsoap-mode.emacsen-install similarity index 75% rename from debian/emacsen-install rename to debian/liquidsoap-mode.emacsen-install index cda3a57..c0ab814 100644 --- a/debian/emacsen-install +++ b/debian/liquidsoap-mode.emacsen-install @@ -12,18 +12,12 @@ if [ ${FLAVOR} = emacs ]; 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" - ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} +RELELDIR=../../../emacs/site-lisp/${PACKAGE} -# Install-info-altdir does not actually exist. +# 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} @@ -33,13 +27,26 @@ fi install -m 755 -d ${ELCDIR} cd ${ELDIR} FILES=`echo *.el` -cp ${FILES} ${ELCDIR} cd ${ELCDIR} +ln -sf ${RELELDIR}/*.el . cat << EOF > path.el (setq load-path (cons "." load-path) byte-compile-warnings nil) EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el + +case "${FLAVOR}" in + xemacs21) + ;; + emacs*) + ${FLAVOR} ${FLAGS} ${FILES} + ;; +esac + +rm -f path.el + +cd ${ELCDIR} +for f in ${FILES} ; do + ln -sf ${RELELDIR}/$f . +done exit 0 diff --git a/debian/liquidsoap-mode.emacsen-remove b/debian/liquidsoap-mode.emacsen-remove new file mode 100644 index 0000000..81274a9 --- /dev/null +++ b/debian/liquidsoap-mode.emacsen-remove @@ -0,0 +1,10 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/liquidsoap-mode + +FLAVOR=$1 +PACKAGE=liquidsoap-mode + +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/liquidsoap-mode.emacsen-startup b/debian/liquidsoap-mode.emacsen-startup new file mode 100644 index 0000000..eba5ad3 --- /dev/null +++ b/debian/liquidsoap-mode.emacsen-startup @@ -0,0 +1,10 @@ +(add-to-list 'auto-mode-alist '("\\.liq\\'" . liquidsoap-mode)) +(autoload 'liquidsoap-mode "liquidsoap-mode" "Major mode for editing Liquidsoap code" t) +(debian-pkg-add-load-path-item + (concat "/usr/share/" + (symbol-name debian-emacs-flavor) + "/site-lisp/liquidsoap-mode")) + + + + -- liquidsoap packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits