From: Jameson Graef Rollins Date: Sun, 20 Dec 2009 16:03:19 +0000 (-0500) Subject: Merge branch 'upstream' into debian X-Git-Tag: debian-0.1-1~19^2~17 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=518c8c0d3f9d845b2e5a87e83382d61b05fc2958;hp=dac01ec52036e0320f66211be3dc5e5126eb218f Merge branch 'upstream' into debian --- diff --git a/configure b/configure index fa8e142b..c6e0c09a 100755 --- a/configure +++ b/configure @@ -59,12 +59,6 @@ for option; do exit 0 elif [ "${option%%=*}" = '--prefix' ] ; then PREFIX="${option#*=}" - else - echo "Unrecognized option: ${option}." - echo "See:" - echo " $0 --help" - echo "" - exit 1 fi done diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..4a941fee --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +notmuch (0.0-1) unstable; urgency=low + + * New Debian package + + -- Jameson Graef Rollins Fri, 27 Nov 2009 13:39:09 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..7f8f011e --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..060eb3ad --- /dev/null +++ b/debian/control @@ -0,0 +1,20 @@ +Source: notmuch +Section: mail +Priority: extra +Maintainer: Jameson Graef Rollins +Build-Depends: debhelper (>= 7.0), pkg-config, libxapian-dev, libgmime-2.4-dev, libtalloc-dev, libz-dev +Standards-Version: 3.8.3 +Homepage: http://notmuchmail.org/ +Vcs-Git: git://notmuchmail.org/git/notmuch +Dm-Upload-Allowed: yes + +Package: notmuch +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: emacs +Enhances: emacs +Description: thread-based email index, search and tagging + Notmuch is a system for indexing, searching, reading, and tagging + large collections of email messages. It uses the Xapian library to + provide fast, full-text search of very large collection of email with + a very convenient search syntax. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..f63cb12d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,42 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Debianized-By: Jameson Graef Rollins +Debianized-Date: Fri Nov 28 18:00:00 EDT 2009 +Original-Source: git://notmuchmail.org/git/notmuch + +Files: * +Copyright: Copyright 2009 Carl Worth + Bart Trojanowski + Keith Packard + Alexander Botero-Lowry + Ingmar Vanhassel + Jed Brown + Jan Janak + Chris Wilson + Keith Amidon + Aneesh Kumar K.V + Mikhail Gusarov + Jeffrey C. Ollie + Jameson Graef Rollins + Stewart Smith + Adrian Perez + Kan-Ru Chen + James Rowe + Eric Anholt + Alec Berryman + Tassilo Horn + Stefan Schmidt + Rolland Santimano + Peter Wang + Lars Kellogg-Stedman + Holger Freyther + David Bremner + Alexander Botero-Lowry + +License: GPL-3+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + On Debian systems, the complete text of the GNU General Public License + version 3 can be found in file "/usr/share/common-licenses/GPL-3". diff --git a/debian/notmuch.dirs b/debian/notmuch.dirs new file mode 100644 index 00000000..41691dff --- /dev/null +++ b/debian/notmuch.dirs @@ -0,0 +1,6 @@ +usr/bin +usr/share +usr/share/man +usr/share/man1 +usr/share/emacs/site-lisp/notmuch +etc/bash_completion.d diff --git a/debian/notmuch.emacsen-install b/debian/notmuch.emacsen-install new file mode 100755 index 00000000..67602604 --- /dev/null +++ b/debian/notmuch.emacsen-install @@ -0,0 +1,39 @@ +#! /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 + +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} +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 path.el + +exit 0 diff --git a/debian/notmuch.emacsen-remove b/debian/notmuch.emacsen-remove new file mode 100755 index 00000000..c35e8a42 --- /dev/null +++ b/debian/notmuch.emacsen-remove @@ -0,0 +1,10 @@ +#!/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.emacsen-startup b/debian/notmuch.emacsen-startup new file mode 100644 index 00000000..73f387ec --- /dev/null +++ b/debian/notmuch.emacsen-startup @@ -0,0 +1,19 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file, e.g. /etc/emacs/site-start.d/50notmuch.el +;; for the Debian notmuch package +;; +;; Originally contributed by Nils Naumann +;; Modified by Dirk Eddelbuettel +;; Adapted for dh-make by Jim Van Zandt + +;; 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. + +(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")) diff --git a/debian/notmuch.install b/debian/notmuch.install new file mode 100644 index 00000000..f4124278 --- /dev/null +++ b/debian/notmuch.install @@ -0,0 +1 @@ +notmuch.el usr/share/emacs/site-lisp/notmuch diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..cbe925d7 --- /dev/null +++ b/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@