On 2015-01-16, at 13:14:53 +0100, Martin Quinson wrote: > On Thu, Jan 15, 2015 at 10:10:42PM +0000, Jeremy Sowden wrote: > > Would the attached patch be of use? > > Thanks for that patch. I must confess that I find it surprizingly > complex, actually. I would expect that debhelper in recent version > would only require me to give the name of the file to compile and > install. > > Those files debian/quilt-el.*-install smell like debhelper version 6 > or below, not debhelper version 9 or higher. But it seems to be the > way to go, actually.
I copied the emacsen files from the existing quilt-el package in Wheezy. Having gone back and taken another look, I noticed that it has compat equal to 5, so I've used dh_make to generate new ones. There are a few changes. Diff is attached. > I will try to find the time to test your code soon, but I cannot > really upload quilt before the end of the freeze (which should occure > soon anyway). Thanks, J.
From 914ea611f21b7b95701103d7b613def992d0b769 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden <[email protected]> Date: Fri, 16 Jan 2015 17:35:44 +0000 Subject: [PATCH] Updated emacsen files to dh 9. --- debian/quilt-el.emacsen-install | 26 ++++++++++++++++++-------- debian/quilt-el.emacsen-remove | 5 +++++ debian/quilt-el.emacsen-startup | 4 ++-- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/debian/quilt-el.emacsen-install b/debian/quilt-el.emacsen-install index 7fafa87..cfe2be3 100644 --- a/debian/quilt-el.emacsen-install +++ b/debian/quilt-el.emacsen-install @@ -12,26 +12,36 @@ if [ ${FLAVOR} = emacs ]; then exit 0; fi echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} -SITEFLAG="-no-site-file" +#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} +ELRELDIR=../../../emacs/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} -rm -f ${ELCDIR}/*.el FILES=`echo *.el` -cp ${FILES} ${ELCDIR} cd ${ELCDIR} +ln -sf ${ELRELDIR}/*.el . cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) +(debian-pkg-add-load-path-item ".") +(setq byte-compile-warnings nil) EOF ${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el -for i in ${FILES}; do - ln -fs ${ELDIR}/$i -done +rm -f path.el exit 0 diff --git a/debian/quilt-el.emacsen-remove b/debian/quilt-el.emacsen-remove index b1b15d9..bb03de7 100644 --- a/debian/quilt-el.emacsen-remove +++ b/debian/quilt-el.emacsen-remove @@ -5,6 +5,11 @@ FLAVOR=$1 PACKAGE=quilt-el 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/quilt.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/quilt-el.emacsen-startup b/debian/quilt-el.emacsen-startup index 30afb6a..30a8900 100644 --- a/debian/quilt-el.emacsen-startup +++ b/debian/quilt-el.emacsen-startup @@ -13,13 +13,13 @@ ;; 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) + (symbol-name debian-emacs-flavor) "/site-lisp/quilt-el"))) ;; If package-dir does not exist, the quilt-el package must have ;; removed but not purged, and we should skip the setup. (when (file-directory-p package-dir) (if (fboundp 'debian-pkg-add-load-path-item) - (debian-pkg-add-load-path-item package-dir) + (debian-pkg-add-load-path-item package-dir) (setq load-path (cons package-dir load-path))) (autoload 'quilt-mode "quilt" "Minor mode for editing files on quilt hierarchy." -- 2.1.4
signature.asc
Description: Digital signature
