From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 7CAFC6DE0C67 for ; Fri, 11 Nov 2016 03:47:32 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.006 X-Spam-Level: X-Spam-Status: No, score=-0.006 tagged_above=-999 required=5 tests=[AWL=0.005, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xEVtVnOCCVfZ for ; Fri, 11 Nov 2016 03:47:32 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id E420F6DE0C6D for ; Fri, 11 Nov 2016 03:47:26 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1c5AIU-0003af-TM; Fri, 11 Nov 2016 06:47:06 -0500 Received: (nullmailer pid 29562 invoked by uid 1000); Fri, 11 Nov 2016 11:47:21 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 2/3] debian: convert to use dh-elpa Date: Fri, 11 Nov 2016 07:46:51 -0400 Message-Id: <20161111114652.29474-3-david@tethera.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161111114652.29474-1-david@tethera.net> References: <20161111114652.29474-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2016 11:47:32 -0000 This packaging helper eliminates most of the boilerplate from packaging emacs extensions for debian. It requires package.el compatible metadata. --- debian/control | 14 +++++------ debian/elpa-notmuch.elpa | 1 + debian/notmuch-emacs.dirs | 1 - debian/notmuch-emacs.emacsen-compat | 1 - debian/notmuch-emacs.emacsen-install | 48 ------------------------------------ debian/notmuch-emacs.emacsen-remove | 34 ------------------------- debian/notmuch-emacs.install | 1 - debian/notmuch-emacs.postinst | 7 ------ debian/notmuch-emacs.prerm | 3 --- debian/rules | 2 +- 10 files changed, 9 insertions(+), 103 deletions(-) create mode 100644 debian/elpa-notmuch.elpa delete mode 100644 debian/notmuch-emacs.dirs delete mode 100644 debian/notmuch-emacs.emacsen-compat delete mode 100755 debian/notmuch-emacs.emacsen-install delete mode 100755 debian/notmuch-emacs.emacsen-remove delete mode 100644 debian/notmuch-emacs.install delete mode 100644 debian/notmuch-emacs.postinst delete mode 100644 debian/notmuch-emacs.prerm diff --git a/debian/control b/debian/control index 4027a79..a8c7ce2 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,7 @@ Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-7~), dh-python, + dh-elpa (>= 1.3), python-sphinx (>= 1.0), ruby, ruby-dev (>>1:1.9.3~), emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) | @@ -111,13 +112,12 @@ Description: Ruby interface to the notmuch mail search and index library Package: notmuch-emacs Architecture: all -Section: mail -Breaks: notmuch (<<0.6~254~) -Replaces: notmuch (<<0.6~254~) -Depends: ${misc:Depends}, notmuch (>= ${source:Version}), - emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) | - emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~), - emacsen-common (>= 2.0.8) +Description: thread-based email index, search and tagging (transitional package) + This dummy package help ease transition to the new package elpa-notmuch + +Package: elpa-notmuch +Architecture: all +Depends: ${misc:Depends}, ${elpa:Depends} 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 diff --git a/debian/elpa-notmuch.elpa b/debian/elpa-notmuch.elpa new file mode 100644 index 0000000..b4e9e17 --- /dev/null +++ b/debian/elpa-notmuch.elpa @@ -0,0 +1 @@ +emacs/*.el diff --git a/debian/notmuch-emacs.dirs b/debian/notmuch-emacs.dirs deleted file mode 100644 index caeb400..0000000 --- a/debian/notmuch-emacs.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/emacs/site-lisp/notmuch diff --git a/debian/notmuch-emacs.emacsen-compat b/debian/notmuch-emacs.emacsen-compat deleted file mode 100644 index 573541a..0000000 --- a/debian/notmuch-emacs.emacsen-compat +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/debian/notmuch-emacs.emacsen-install b/debian/notmuch-emacs.emacsen-install deleted file mode 100755 index cce95c3..0000000 --- a/debian/notmuch-emacs.emacsen-install +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# /usr/lib/emacsen-common/packages/install/notmuch-emacs -set -e - -FLAVOR=$1 -PACKAGE=notmuch - -case "${FLAVOR}" in - emacs) - return 0 - ;; - xemacs*|emacs2[12]) - # patches welcome. - echo install/${PACKAGE}: skipping install for unsupported emacsen flavor ${FLAVOR} - exit 0 - ;; - *) - echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} -esac - - -elc_dir=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} -el_dir=/usr/share/emacs/site-lisp/${PACKAGE} - -byte_compile_options="--quick --directory=${el_dir} -batch -f batch-byte-compile" - -echo install/${PACKAGE}: byte-compiling for ${FLAVOR} - -[ -d ${elc_dir} ] || mkdir ${elc_dir} - -# Create symlinks to the .el files (see section 6E in debian-emacs -# polcy). This makes complation easy, and also allows find-function -# and find-library to work properly. -(cd ${elc_dir} && ln -sf ${el_dir}/*.el .) - -# Byte compile them -(cd ${elc_dir} - set +e - ${FLAVOR} ${byte_compile_options} *.el > Install.log 2>&1 - if test $? -ne 0 - then - cat Install.log - exit 1 - fi - set -e - gzip -9f Install.log) - -exit 0; diff --git a/debian/notmuch-emacs.emacsen-remove b/debian/notmuch-emacs.emacsen-remove deleted file mode 100755 index a555320..0000000 --- a/debian/notmuch-emacs.emacsen-remove +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# /usr/lib/emacsen-common/packages/remove/notmuch - -set -e - -FLAVOR=$1 -PACKAGE=notmuch -elc_dir=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -case "${FLAVOR}" in - emacs) - return 0 - ;; - xemacs*|emacs2[12]) - # patches welcome. - echo install/${PACKAGE}: skipping removal for unsupported emacsen flavor ${FLAVOR} - exit 0 - ;; - *) - echo remove/${PACKAGE}: Handling removal for emacsen flavor ${FLAVOR} -esac - -echo remove/${PACKAGE}: Handling removal of emacsen flavor ${FLAVOR} - -echo emacsen-common: purging byte-compiled files for ${FLAVOR} -rm -f ${elc_dir}/*.elc -rm -f ${elc_dir}/*.el -rm -f ${elc_dir}/Install.log* -if test -e "${elc_dir}" -then - rmdir --ignore-fail-on-non-empty "${elc_dir}" -fi - -exit 0; diff --git a/debian/notmuch-emacs.install b/debian/notmuch-emacs.install deleted file mode 100644 index c73aece..0000000 --- a/debian/notmuch-emacs.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/emacs/site-lisp/notmuch/*.el diff --git a/debian/notmuch-emacs.postinst b/debian/notmuch-emacs.postinst deleted file mode 100644 index 1237237..0000000 --- a/debian/notmuch-emacs.postinst +++ /dev/null @@ -1,7 +0,0 @@ -dir="/var/lib/emacsen-common/state/package/installed" -mkdir -p -m 0755 ${dir} -touch ${dir}/notmuch-emacs -#DEBHELPER# -if [ -d /0755 ]; then - rmdir /0755 || true -fi diff --git a/debian/notmuch-emacs.prerm b/debian/notmuch-emacs.prerm deleted file mode 100644 index 5e2758d..0000000 --- a/debian/notmuch-emacs.prerm +++ /dev/null @@ -1,3 +0,0 @@ -#DEBHELPER# -dir="/var/lib/emacsen-common/state/package/installed" -rm -f ${dir}/notmuch-emacs diff --git a/debian/rules b/debian/rules index 04f0062..15710a8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ python3_all = py3versions -s | xargs -n1 | xargs -t -I {} env {} %: - dh $@ --with python2,python3 + dh $@ --with python2,python3,elpa override_dh_auto_configure: ./configure --prefix=/usr \ -- 2.10.2