From cfa246272d61c735dd77b9a873ce477d81321c46 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 28 Nov 2009 18:22:58 -0500 Subject: [PATCH 01/48] fix configure script to handle --prefix= and properly create Makefile.config This also removes the Makefile.config from the repository, since it shouldn't be kept in the repository and should be created by the configure script. --- Makefile.config | 3 --- configure | 12 +++++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 Makefile.config diff --git a/Makefile.config b/Makefile.config deleted file mode 100644 index ddc74365..00000000 --- a/Makefile.config +++ /dev/null @@ -1,3 +0,0 @@ -prefix = /usr/local -bash_completion_dir = /etc/bash_completion.d -CFLAGS += -DHAVE_VALGRIND diff --git a/configure b/configure index e55f067e..ab28fa30 100755 --- a/configure +++ b/configure @@ -1,5 +1,15 @@ #! /bin/sh +# defaults +PREFIX=/usr/local + +# option parsing +for option; do + if [ "${option%=*}" = '--prefix' ] ; then + PREFIX="${option#*=}" + fi +done + cat < Makefile.config < Date: Sat, 28 Nov 2009 18:27:57 -0500 Subject: [PATCH 02/48] add checking for zlib development libraries to configure script --- configure | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ab28fa30..1010799d 100755 --- a/configure +++ b/configure @@ -63,6 +63,15 @@ else errors=$((errors + 1)) fi +if printf 'int main(){return 0;}' | gcc -x c -lz -o /dev/null - > /dev/null 2>&1; then + echo "Checking for zlib development files... Yes." + have_zlib=1 +else + echo "Checking for zlib development files... No." + have_zlib=0 + errors=$((errors + 1)) +fi + if pkg-config --modversion valgrind > /dev/null 2>&1; then echo "Checking for valgrind development files... Yes." have_valgrind=-DHAVE_VALGRIND @@ -91,13 +100,16 @@ EOF echo " The talloc library (including development files such as headers)" echo " http://talloc.samba.org/" fi + if [ $have_zlib -eq 0 ]; then + echo " The zlib library (including development files such as headers)" + fi cat < Date: Sat, 28 Nov 2009 18:29:01 -0500 Subject: [PATCH 03/48] fix Makefile.local to install bash completion definitions as not executable --- Makefile.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.local b/Makefile.local index 1744747a..b8186277 100644 --- a/Makefile.local +++ b/Makefile.local @@ -36,7 +36,7 @@ install: all notmuch.1.gz done ; install notmuch $(DESTDIR)$(prefix)/bin/ install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ - install contrib/notmuch-completion.bash \ + install -m0644 contrib/notmuch-completion.bash \ $(DESTDIR)$(bash_completion_dir)/notmuch install-emacs: install emacs From 3cb3d2c021b5c06bae9757400cc8c6b72db16531 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 28 Nov 2009 18:30:43 -0500 Subject: [PATCH 04/48] first crack at debian packaging (using git-buildpackage) --- debian/changelog | 5 ++++ debian/compat | 1 + debian/control | 20 +++++++++++++++ debian/copyright | 42 +++++++++++++++++++++++++++++++ debian/notmuch.dirs | 6 +++++ debian/notmuch.emacsen-install | 45 ++++++++++++++++++++++++++++++++++ debian/notmuch.emacsen-remove | 15 ++++++++++++ debian/notmuch.emacsen-startup | 21 ++++++++++++++++ debian/notmuch.install | 1 + debian/rules | 3 +++ 10 files changed, 159 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/notmuch.dirs create mode 100644 debian/notmuch.emacsen-install create mode 100644 debian/notmuch.emacsen-remove create mode 100644 debian/notmuch.emacsen-startup create mode 100644 debian/notmuch.install create mode 100755 debian/rules 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 100644 index 00000000..2611aed2 --- /dev/null +++ b/debian/notmuch.emacsen-install @@ -0,0 +1,45 @@ +#! /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" + +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} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} ${FILES} +rm -f *.el path.el + +exit 0 diff --git a/debian/notmuch.emacsen-remove b/debian/notmuch.emacsen-remove new file mode 100644 index 00000000..e19ee3da --- /dev/null +++ b/debian/notmuch.emacsen-remove @@ -0,0 +1,15 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/notmuch + +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 new file mode 100644 index 00000000..017938d5 --- /dev/null +++ b/debian/notmuch.emacsen-startup @@ -0,0 +1,21 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file, e.g. /etc/emacs/site-start.d/50notmuch.el +;; for the Debian #PACKAGE# package +;; +;; Originally contributed by Nils Naumann +;; Modified by Dirk Eddelbuettel +;; Adapted for dh-make by Jim Van Zandt + +;; The #PACKAGE# 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)) 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 $@ From 4edf37a1d5067197741b8dcb0bdb72ce4c299c05 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 29 Nov 2009 08:48:46 -0500 Subject: [PATCH 05/48] fix debian packaging emacsen installation --- debian/notmuch.emacsen-install | 14 ++++---------- debian/notmuch.emacsen-remove | 5 ----- debian/notmuch.emacsen-startup | 18 ++++++++---------- 3 files changed, 12 insertions(+), 25 deletions(-) mode change 100644 => 100755 debian/notmuch.emacsen-install mode change 100644 => 100755 debian/notmuch.emacsen-remove diff --git a/debian/notmuch.emacsen-install b/debian/notmuch.emacsen-install old mode 100644 new mode 100755 index 2611aed2..67602604 --- 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 old mode 100644 new mode 100755 index e19ee3da..c35e8a42 --- 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 ;; Modified by Dirk Eddelbuettel ;; Adapted for dh-make by Jim Van Zandt -;; 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")) From 9f99a301b158dc1ed1c8c6754db1d57e3b0becf4 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 5 Dec 2009 02:02:38 -0500 Subject: [PATCH 06/48] Remove ./configure failure for unrecognized options The Debian build process (and presumably others) passes many options to the configure script. Most of them are not needed for notmuch. The configure script needs to just silently ignore the extra options it's not using, so that the configure stage won't fail and the build process can continue. --- configure | 6 ------ 1 file changed, 6 deletions(-) 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 From 3650f4d1950e923ea5d28e76a321ce0d62f810de Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Wed, 23 Dec 2009 21:15:55 -0500 Subject: [PATCH 07/48] modify install target to depend on install-emacs and install-bash This makes the Debian package building scripts much simpler. --- Makefile.local | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.local b/Makefile.local index 933ff4c7..2d540965 100644 --- a/Makefile.local +++ b/Makefile.local @@ -27,7 +27,7 @@ notmuch: $(notmuch_client_modules) lib/notmuch.a notmuch.1.gz: notmuch.1 $(call quiet,gzip) --stdout $^ > $@ -install: all notmuch.1.gz +install: all notmuch.1.gz install-emacs install-bash for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 ; \ do \ install -d $$d ; \ @@ -35,7 +35,7 @@ install: all notmuch.1.gz install notmuch $(DESTDIR)$(prefix)/bin/ install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ -install-emacs: install emacs +install-emacs: emacs for d in $(DESTDIR)/$(emacs_lispdir) ; \ do \ install -d $$d ; \ From 4989ef3d871f2510dcf9cf65e7fddd81deeff82e Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Wed, 23 Dec 2009 21:23:19 -0500 Subject: [PATCH 08/48] rework Debian emacsen-startup script. --- debian/notmuch.emacsen-startup | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/notmuch.emacsen-startup b/debian/notmuch.emacsen-startup index 73f387ec..25a527f5 100644 --- a/debian/notmuch.emacsen-startup +++ b/debian/notmuch.emacsen-startup @@ -2,18 +2,22 @@ ;; ;; 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.") +(cond + ((not (file-exists-p "/usr/share/emacs/site-lisp/notmuch")) + (message "Package notmuch removed but not purged. Skipping setup.")) + ((not (file-exists-p (concat "/usr/share/" + (symbol-name debian-emacs-flavor) + "/site-lisp/notmuch"))) + (message "Package notmuch not fully installed. Skipping setup.")) + (t (debian-pkg-add-load-path-item - (concat - "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/notmuch")) + (concat "/usr/share/" + (symbol-name debian-emacs-flavor) + "/site-lisp/notmuch")) + )) From 994e46845d57c4cf912b674d45b4ae13b478d6ee Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Sat, 9 Jan 2010 11:50:12 +1300 Subject: [PATCH 09/48] Add build-dependency on emacs Signed-off-by: martin f. krafft --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 060eb3ad..9334540d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ 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 +Build-Depends: debhelper (>= 7.0), pkg-config, libxapian-dev, libgmime-2.4-dev, libtalloc-dev, libz-dev, emacs Standards-Version: 3.8.3 Homepage: http://notmuchmail.org/ Vcs-Git: git://notmuchmail.org/git/notmuch From 9cef26de47ced5863522e40e58f1f1f33b50ba33 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 13:59:40 +1300 Subject: [PATCH 10/48] add Vcs-Browser field Signed-off-by: martin f. krafft --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 9334540d..e105d55c 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 7.0), pkg-config, libxapian-dev, libgmime-2.4-dev, Standards-Version: 3.8.3 Homepage: http://notmuchmail.org/ Vcs-Git: git://notmuchmail.org/git/notmuch +Vcs-Browser: http://git.debian.org/?p=collab-maint/notmuch.git;a=summary Dm-Upload-Allowed: yes Package: notmuch From 61209b5d65f0fbd891759f188ce315abb90215ea Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:05:45 +1300 Subject: [PATCH 11/48] Start new changelog stanza pending upload Signed-off-by: martin f. krafft --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4a941fee..4c11d039 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +notmuch (0.0+201001211401) unstable; urgency=low + + * New versioning scheme. + * Added emacs build dependency. + * Added Vcs-Browser field to debian/control. + + -- martin f. krafft Thu, 21 Jan 2010 14:00:54 +1300 + notmuch (0.0-1) unstable; urgency=low * New Debian package From cf72677e3476cc59d7b31c249fd9024243d47a09 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:06:09 +1300 Subject: [PATCH 12/48] Fix suggestions/enhancements for vim+emacs Signed-off-by: martin f. krafft --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c11d039..88bcc40c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ notmuch (0.0+201001211401) unstable; urgency=low * New versioning scheme. * Added emacs build dependency. * Added Vcs-Browser field to debian/control. + * Downgrade recommendation for emacs to suggestion. + * Add vim to suggestions and enhancements. -- martin f. krafft Thu, 21 Jan 2010 14:00:54 +1300 diff --git a/debian/control b/debian/control index e105d55c..6038fd39 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Dm-Upload-Allowed: yes Package: notmuch Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: emacs -Enhances: emacs +Enhances: emacs, vim +Suggests: emacs, vim 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 From 1551c35925b7466069f43b4f469142e02f704c32 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:07:36 +1300 Subject: [PATCH 13/48] Put debian/* under separate copyright. Signed-off-by: martin f. krafft --- debian/changelog | 1 + debian/copyright | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 88bcc40c..c398fc93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ notmuch (0.0+201001211401) unstable; urgency=low * Added Vcs-Browser field to debian/control. * Downgrade recommendation for emacs to suggestion. * Add vim to suggestions and enhancements. + * Put debian/* under separate copyright. -- martin f. krafft Thu, 21 Jan 2010 14:00:54 +1300 diff --git a/debian/copyright b/debian/copyright index f63cb12d..1cc7a155 100644 --- a/debian/copyright +++ b/debian/copyright @@ -40,3 +40,16 @@ License: GPL-3+ . 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". + +Files: debian/* +Copyright: Copyright 2010 Jameson Graef Rollins + martin f. krafft + +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". From 76ba4956962966cf9275304b9458c0c17daa408f Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:08:08 +1300 Subject: [PATCH 14/48] no need to create /usr/share dirs Signed-off-by: martin f. krafft --- debian/notmuch.dirs | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/notmuch.dirs b/debian/notmuch.dirs index 41691dff..caa41609 100644 --- a/debian/notmuch.dirs +++ b/debian/notmuch.dirs @@ -1,6 +1,3 @@ usr/bin -usr/share -usr/share/man -usr/share/man1 usr/share/emacs/site-lisp/notmuch etc/bash_completion.d From 38f1bf18c3c59fdb60aff71851bad45dbc5b51aa Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:09:00 +1300 Subject: [PATCH 15/48] add ITP bug number to changelog entry about upload Signed-off-by: martin f. krafft --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c398fc93..52029acb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ notmuch (0.0+201001211401) unstable; urgency=low + * Upload to Debian (closes: #557354). * New versioning scheme. * Added emacs build dependency. * Added Vcs-Browser field to debian/control. @@ -11,6 +12,6 @@ notmuch (0.0+201001211401) unstable; urgency=low notmuch (0.0-1) unstable; urgency=low - * New Debian package + * New Debian package. -- Jameson Graef Rollins Fri, 27 Nov 2009 13:39:09 -0500 From 814d2887aea8f2fd4fe0c8bee8efe97a05e849b5 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:18:35 +1300 Subject: [PATCH 16/48] Build-depend on emacs23 Signed-off-by: martin f. krafft --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6038fd39..ceecfef6 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ 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, emacs +Build-Depends: debhelper (>= 7.0), pkg-config, libxapian-dev, libgmime-2.4-dev, libtalloc-dev, libz-dev, emacs (>= 23~) Standards-Version: 3.8.3 Homepage: http://notmuchmail.org/ Vcs-Git: git://notmuchmail.org/git/notmuch From cd9778c967dfa5dac57bcce86f544f4e4df79aac Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:38:24 +1300 Subject: [PATCH 17/48] put cworth as maintainer per his own request Signed-off-by: martin f. krafft --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 52029acb..c8a9baba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ notmuch (0.0+201001211401) unstable; urgency=low * Downgrade recommendation for emacs to suggestion. * Add vim to suggestions and enhancements. * Put debian/* under separate copyright. + * Make Carl the maintainer. -- martin f. krafft Thu, 21 Jan 2010 14:00:54 +1300 diff --git a/debian/control b/debian/control index ceecfef6..fdd1f38c 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: notmuch Section: mail Priority: extra -Maintainer: Jameson Graef Rollins +Maintainer: Carl Worth +Uploaders: Jameson Graef Rollins Build-Depends: debhelper (>= 7.0), pkg-config, libxapian-dev, libgmime-2.4-dev, libtalloc-dev, libz-dev, emacs (>= 23~) Standards-Version: 3.8.3 Homepage: http://notmuchmail.org/ From 9a66a8f8770ccccb5394f4c8e633d1cf884043f6 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:38:50 +1300 Subject: [PATCH 18/48] add myself to uploaders Signed-off-by: martin f. krafft --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c8a9baba..43a7355f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ notmuch (0.0+201001211401) unstable; urgency=low * Add vim to suggestions and enhancements. * Put debian/* under separate copyright. * Make Carl the maintainer. + * Add myself to uploaders. -- martin f. krafft Thu, 21 Jan 2010 14:00:54 +1300 diff --git a/debian/control b/debian/control index fdd1f38c..0034b86d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: notmuch Section: mail Priority: extra Maintainer: Carl Worth -Uploaders: Jameson Graef Rollins +Uploaders: Jameson Graef Rollins , martin f. krafft Build-Depends: debhelper (>= 7.0), pkg-config, libxapian-dev, libgmime-2.4-dev, libtalloc-dev, libz-dev, emacs (>= 23~) Standards-Version: 3.8.3 Homepage: http://notmuchmail.org/ From 6e4be17ab84b5b20409c1420eeb1f4f1db7dc52f Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:58:19 +1300 Subject: [PATCH 19/48] Install vim plugin with vim-addons Signed-off-by: martin f. krafft --- debian/README.Debian | 6 ++++++ debian/changelog | 1 + debian/notmuch.dirs | 3 +++ debian/rules | 10 ++++++++++ vim/notmuch.yaml | 8 ++++++++ 5 files changed, 28 insertions(+) create mode 100644 debian/README.Debian create mode 100644 vim/notmuch.yaml diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 00000000..f07b4991 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,6 @@ +notmuch for Debian +================== + +To use the vim plugin, please install it using vim-addons(1) + + -- martin f. krafft Thu, 21 Jan 2010 14:50:19 +1300 diff --git a/debian/changelog b/debian/changelog index 43a7355f..d95f673a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ notmuch (0.0+201001211401) unstable; urgency=low * Put debian/* under separate copyright. * Make Carl the maintainer. * Add myself to uploaders. + * Install the vim plugin (using vim-addons). -- martin f. krafft Thu, 21 Jan 2010 14:00:54 +1300 diff --git a/debian/notmuch.dirs b/debian/notmuch.dirs index caa41609..ce7f2393 100644 --- a/debian/notmuch.dirs +++ b/debian/notmuch.dirs @@ -1,3 +1,6 @@ usr/bin usr/share/emacs/site-lisp/notmuch +usr/share/vim/registry +usr/share/vim/addons/plugin +usr/share/vim/addons/syntax etc/bash_completion.d diff --git a/debian/rules b/debian/rules index cbe925d7..1f6c4bbc 100755 --- a/debian/rules +++ b/debian/rules @@ -1,3 +1,13 @@ #!/usr/bin/make -f %: dh $@ + +override_dh_installdocs: + dh_installdocs + install -m644 vim/README debian/notmuch/usr/share/doc/notmuch/README.vim + +override_dh_install: + dh_install + install -m644 vim/plugin/notmuch.vim debian/notmuch/usr/share/vim/addons/plugin + install -m644 vim/syntax/notmuch-*.vim debian/notmuch/usr/share/vim/addons/syntax + install -m644 vim/notmuch.yaml debian/notmuch/usr/share/vim/registry diff --git a/vim/notmuch.yaml b/vim/notmuch.yaml new file mode 100644 index 00000000..3d8422c8 --- /dev/null +++ b/vim/notmuch.yaml @@ -0,0 +1,8 @@ +addon: notmuch +description: "notmuch mail user interface" +files: + - plugin/notmuch.vim + - syntax/notmuch-compose.vim + - syntax/notmuch-folders.vim + - syntax/notmuch-search.vim + - syntax/notmuch-show.vim From b416d7e6b95b36c71fd5dd0176473f865d1334fc Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Thu, 21 Jan 2010 14:58:32 +1300 Subject: [PATCH 20/48] builddep on dh must be versioned due to overrides Signed-off-by: martin f. krafft --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 0034b86d..291cb02d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: mail Priority: extra Maintainer: Carl Worth Uploaders: Jameson Graef Rollins , martin f. krafft -Build-Depends: debhelper (>= 7.0), pkg-config, libxapian-dev, libgmime-2.4-dev, libtalloc-dev, libz-dev, emacs (>= 23~) +Build-Depends: debhelper (>= 7.0.50~), pkg-config, libxapian-dev, libgmime-2.4-dev, libtalloc-dev, libz-dev, emacs (>= 23~) Standards-Version: 3.8.3 Homepage: http://notmuchmail.org/ Vcs-Git: git://notmuchmail.org/git/notmuch From c2904e9842a0c81ec4ab907f84ce420c585cc880 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 26 Jan 2010 09:52:49 +1300 Subject: [PATCH 21/48] Add suggestion to vim-addon-manager. Signed-off-by: martin f. krafft --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d95f673a..c6cc859f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +notmuch (0.0+201001211402) UNRELEASED; urgency=low + + * Add suggestion to vim-addon-manager. + + -- martin f. krafft Tue, 26 Jan 2010 09:52:29 +1300 + notmuch (0.0+201001211401) unstable; urgency=low * Upload to Debian (closes: #557354). diff --git a/debian/control b/debian/control index 291cb02d..e60be2af 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Package: notmuch Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Enhances: emacs, vim -Suggests: emacs, vim +Suggests: emacs, vim, vim-addon-manager 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 From 43c9c1138966ef81f2a5ebe89136ddefb3fa175e Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 25 Feb 2010 11:11:59 -0800 Subject: [PATCH 22/48] control: Update package description to follow upstream README. Justin B Rye pointed out (in Debian bug #566282) that a user with mail in mbox format can spend a lot of time investigating notmuch before realizing that mbox is not supported. Head that off with a more detailed mention in the package description. --- debian/changelog | 6 +++++- debian/control | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c6cc859f..1a7f921c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ notmuch (0.0+201001211402) UNRELEASED; urgency=low + [ martin f. krafft ] * Add suggestion to vim-addon-manager. - -- martin f. krafft Tue, 26 Jan 2010 09:52:29 +1300 + [ Carl Worth ] + * Improve package description (closes: #566282). + + -- Carl Worth Thu, 25 Feb 2010 11:16:19 -0800 notmuch (0.0+201001211401) unstable; urgency=low diff --git a/debian/control b/debian/control index e60be2af..39146dc6 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,6 @@ Enhances: emacs, vim Suggests: emacs, vim, vim-addon-manager 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. + large collections of email messages in maildir or mh format. It uses + the Xapian library to provide fast, full-text search with a very + convenient search syntax. From f89b3d16db90be99c3097c8dac0d95930cdd1f1d Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 10:00:30 -0700 Subject: [PATCH 23/48] Makefiles: Eliminate the useless quiet_* functions. With the original quiet function, there's an actual purpose (hiding excessively long compiler command lines so that warnings and errors from the compiler can be seen). But with things like quiet_symlink there's nothing quieter. In fact "SYMLINK" is longer than "ln -sf". So all this is doing is hiding the actual command from the user for no real benefit. The only actual reason we implemented the quiet_* functions was to be able to neatly right-align the command name and left-align the arguments. Let's give up on that, and just left-align everything, simplifying the Makefiles considerably. Now, the only instances of a captialized command name in the output is if there's some actually shortening of the command itself. --- Makefile.local | 46 ++++++++++++++++++-------------------------- configure | 15 --------------- emacs/Makefile.local | 4 ++-- lib/Makefile.local | 18 ++++++++--------- 4 files changed, 30 insertions(+), 53 deletions(-) diff --git a/Makefile.local b/Makefile.local index ecb9ae0d..da31982c 100644 --- a/Makefile.local +++ b/Makefile.local @@ -103,28 +103,20 @@ release-verify-newer: release-verify-version # user how to enable verbose compiles. ifeq ($(V),) quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n" -quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)" %12s $@\n" "$1 $2"; $($1) -quiet_args = @printf $(quiet_DOC)$(eval quiet_DOC:=)" %12s$2\n" $1; $($1) $2 +quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"$1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//')) endif # The user has explicitly enabled quiet compilation. ifeq ($(V),0) -quiet = @printf " %12s $@\n" "$1 $2"; $($1) -quiet_args = @printf " %12s$2\n" $1; $($1) $2 +quiet = @printf "$1 $@\n"; $($(shell echo $1 | sed -e s'/ .*//')) endif # Otherwise, print the full command line. -quiet ?= $($1) -quiet_args ?= $($1) $2 - -quiet_mkdir = $(call quiet_args,MKDIR,$1) -quiet_install_bin = $(call quiet_args,INSTALL-BIN,$1) -quiet_install_data = $(call quiet_args,INSTALL-DATA,$1) -quiet_symlink = $(call quiet_args,SYMLINK,$1) +quiet ?= $($(shell echo $1 | sed -e s'/ .*//')) %.o: %.cc $(global_deps) - $(call quiet,CXX,$(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ + $(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ %.o: %.c $(global_deps) - $(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ + $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ %.elc: %.el $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $< @@ -173,22 +165,22 @@ notmuch_client_srcs = \ notmuch_client_modules = $(notmuch_client_srcs:.c=.o) notmuch: $(notmuch_client_modules) lib/libnotmuch.a - $(call quiet,CC,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@ + $(call quiet,CC $(CFLAGS)) $^ $(FINAL_LDFLAGS) -o $@ notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so - $(call quiet,CC,$(LDFLAGS)) -Llib -lnotmuch $(notmuch_client_modules) $(FINAL_LDFLAGS) -o $@ + $(call quiet,CC $(CFLAGS)) -Llib -lnotmuch $(notmuch_client_modules) $(FINAL_LDFLAGS) -o $@ notmuch.1.gz: notmuch.1 - $(call quiet,gzip) --stdout $^ > $@ + gzip --stdout $^ > $@ .PHONY: install install: all notmuch.1.gz - $(call quiet_mkdir, $(DESTDIR)$(prefix)/bin/) - $(call quiet_mkdir, $(DESTDIR)$(libdir)/) - $(call quiet_mkdir, $(DESTDIR)$(prefix)/include/) - $(call quiet_mkdir, $(DESTDIR)$(prefix)/share/man/man1) - $(call quiet_install_bin, notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch) - $(call quiet_install_data, notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/) + mkdir -p $(DESTDIR)$(prefix)/bin/ + mkdir -p $(DESTDIR)$(libdir)/ + mkdir -p $(DESTDIR)$(prefix)/include/ + mkdir -p $(DESTDIR)$(prefix)/share/man/man1 + install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch + install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ ifeq ($(MAKECMDGOALS), install) @echo "" @echo "Notmuch is now installed." @@ -204,18 +196,18 @@ endif .PHONY: install-desktop install-desktop: - $(call quiet,MKDIR) $(DESTDIR)$(desktop_dir) + mkdir -p $(DESTDIR)$(desktop_dir) desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop .PHONY: install-bash install-bash: - $(call quiet-mkdir, $(DESTDIR)$(bash_completion_dir)) - $(call quiet_install_data, contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch) + mkdir -p $(DESTDIR)$(bash_completion_dir) + install -m0644 contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch .PHONY: install-zsh install-zsh: - $(call quiet_mkdir, $(DESTDIR)$(zsh_completion_dir)) - $(call quiet_install_data, contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch) + mkdir -p $(DESTDIR)$(zsh_completion_dir) + install -m0644 contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz diff --git a/configure b/configure index df1636d2..d56caadd 100755 --- a/configure +++ b/configure @@ -279,21 +279,6 @@ CXX = ${CXX} # Command to execute emacs from Makefiles EMACS = emacs --quick -# Command to execute gzip from Makefiles -gzip = gzip - -# Command to create a directory -MKDIR = install -d - -# Command to install an executable -INSTALL-BIN = install - -# Command to install a non-executable file (documentation, etc.) -INSTALL-DATA = install -m0644 - -# Command to create a symbolic link -SYMLINK = ln -sf - # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g") CFLAGS = ${CFLAGS} diff --git a/emacs/Makefile.local b/emacs/Makefile.local index 76cc64f9..51d045c3 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -14,8 +14,8 @@ emacs: $(emacs_bytecode) .PHONY: install-emacs install-emacs: install emacs - $(call quiet_mkdir, $(DESTDIR)/$(emacs_lispdir)) - $(call quiet_install_data, $(emacs_sources) $(emacs_bytecode) $(DESTDIR)$(emacs_lispdir)) + mkdir -p $(DESTDIR)/$(emacs_lispdir) + install -m0644 $(emacs_sources) $(emacs_bytecode) $(DESTDIR)$(emacs_lispdir) @echo "" @echo "The notmuch emacs client is now installed." @echo "" diff --git a/lib/Makefile.local b/lib/Makefile.local index c98fb673..03a458b2 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -51,23 +51,23 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) $(call quiet,AR) rcs $@ $^ $(dir)/$(LIBNAME): $(libnotmuch_modules) - $(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@ + $(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@ $(dir)/$(SONAME): $(dir)/$(LIBNAME) - $(call quiet_symlink, $(LIBNAME) $@) + ln -sf $(LIBNAME) $@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME) - $(call quiet_symlink, $(LIBNAME) $@) + ln -sf $(LIBNAME) $@ install: install-$(dir) install-$(dir): - $(call quiet_mkdir, $(DESTDIR)$(libdir)/) - $(call quiet_install_data, $(dir)/$(LIBNAME) $(DESTDIR)$(libdir)/) - $(call quiet_symlink, $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME)) - $(call quiet_symlink, $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME)) - $(call quiet_mkdir, $(DESTDIR)$(prefix)/include/) - $(call quiet_install_data, $(dir)/notmuch.h $(DESTDIR)$(prefix)/include/) + mkdir -p $(DESTDIR)$(libdir)/ + install -m0644 $(dir)/$(LIBNAME) $(DESTDIR)$(libdir)/ + ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME) + ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME) + mkdir -p $(DESTDIR)$(prefix)/include/ + install -m0644 $(dir)/notmuch.h $(DESTDIR)$(prefix)/include/ SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs) CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a From a5ed8c68f6db37d3866088a9770447eba6833109 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 10:35:20 -0700 Subject: [PATCH 24/48] Makefile: Eliminate the "make install-emacs" target. Instead, simply byte-compile the emacs source files as part of "make" and install them as part of "make install". The byte compilation is made conditional on the configure script finding the emacs binary. That way, "make; make install" will still work for someone that doesn't have emacs installed, (which was the only reason we had made a separate "make install-emacs" target in the first place). --- Makefile.local | 12 +++++++----- configure | 12 ++++++++++++ emacs/Makefile.local | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Makefile.local b/Makefile.local index da31982c..bb8ea543 100644 --- a/Makefile.local +++ b/Makefile.local @@ -118,9 +118,6 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//')) %.o: %.c $(global_deps) $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -%.elc: %.el - $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $< - .deps/%.d: %.c $(global_deps) @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \ $(CC) -M $(CPPFLAGS) $(FINAL_CFLAGS) $< > $@.$$$$ 2>/dev/null ; \ @@ -183,12 +180,17 @@ install: all notmuch.1.gz install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ ifeq ($(MAKECMDGOALS), install) @echo "" - @echo "Notmuch is now installed." + @echo "Notmuch is now installed to $(DESTDIR)$(prefix)" + @echo "" + @echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:" + @echo "" + @echo " (require 'notmuch)" + @echo "" + @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\"" @echo "" @echo "You may now want to install additional components to support using notmuch" @echo "together with other software packages:" @echo "" - @echo " make install-emacs" @echo " make install-bash" @echo " make install-zsh" @echo "" diff --git a/configure b/configure index d56caadd..ba205764 100755 --- a/configure +++ b/configure @@ -175,6 +175,15 @@ else emacs_lispdir='$(prefix)/share/emacs/site-lisp' fi +printf "Checking if emacs is available... " +if emacs --quick --batch > /dev/null 2>&1; then + printf "Yes.\n" + have_emacs=1 +else + printf "No (so will not byte-compile emacs code)\n" + have_emacs=0 +fi + if [ $errors -gt 0 ]; then cat < Date: Tue, 6 Apr 2010 10:40:45 -0700 Subject: [PATCH 25/48] Makefile: Eliminate the separate install-bash and install-zsh targets. Again, simplifying the interface to the Makefile. Installing these files doesn't require bash nor zsh to actually be installed, so there's little harm in just installing them unconditionally. --- Makefile.local | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/Makefile.local b/Makefile.local index bb8ea543..5c264298 100644 --- a/Makefile.local +++ b/Makefile.local @@ -172,12 +172,14 @@ notmuch.1.gz: notmuch.1 .PHONY: install install: all notmuch.1.gz - mkdir -p $(DESTDIR)$(prefix)/bin/ - mkdir -p $(DESTDIR)$(libdir)/ - mkdir -p $(DESTDIR)$(prefix)/include/ mkdir -p $(DESTDIR)$(prefix)/share/man/man1 - install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ + mkdir -p $(DESTDIR)$(bash_completion_dir) + install -m0644 contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch + mkdir -p $(DESTDIR)$(zsh_completion_dir) + install -m0644 contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch + mkdir -p $(DESTDIR)$(prefix)/bin/ + install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch ifeq ($(MAKECMDGOALS), install) @echo "" @echo "Notmuch is now installed to $(DESTDIR)$(prefix)" @@ -187,13 +189,6 @@ ifeq ($(MAKECMDGOALS), install) @echo " (require 'notmuch)" @echo "" @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\"" - @echo "" - @echo "You may now want to install additional components to support using notmuch" - @echo "together with other software packages:" - @echo "" - @echo " make install-bash" - @echo " make install-zsh" - @echo "" endif .PHONY: install-desktop @@ -201,15 +196,5 @@ install-desktop: mkdir -p $(DESTDIR)$(desktop_dir) desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop -.PHONY: install-bash -install-bash: - mkdir -p $(DESTDIR)$(bash_completion_dir) - install -m0644 contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch - -.PHONY: install-zsh -install-zsh: - mkdir -p $(DESTDIR)$(zsh_completion_dir) - install -m0644 contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch - SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz From f23b233e3ad7217c207ff2d4b223d729f4002330 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 10:43:36 -0700 Subject: [PATCH 26/48] .gitignore: Ignore the releases directory. The "make release" target creates this directory, but it's nothing I'll ever want to add to the git repository. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 95c50ec1..217440d5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libnotmuch.so* *~ .*.swp *.elc +releases From e1a84ab1733c78fce8afeef8f022122988fc8a10 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 10:48:21 -0700 Subject: [PATCH 27/48] Rename the "contrib" directory to "completion". The original "contrib" name is lousy. Everything in notmuch has been contributed, and we are integrating as much of it as possible, (rather than making users grub through contrib looking for useful pieces to install). Meanwhile, the only things we have in contrib are command-line completion scripts, so "completion" makes more sense as a name, (and helps make "./configure" slightly less ambiguous). --- completion/README | 10 ++++++++++ {contrib => completion}/notmuch-completion.bash | 0 {contrib => completion}/notmuch-completion.tcsh | 0 {contrib => completion}/notmuch-completion.zsh | 0 4 files changed, 10 insertions(+) create mode 100644 completion/README rename {contrib => completion}/notmuch-completion.bash (100%) rename {contrib => completion}/notmuch-completion.tcsh (100%) rename {contrib => completion}/notmuch-completion.zsh (100%) diff --git a/completion/README b/completion/README new file mode 100644 index 00000000..40a30e5f --- /dev/null +++ b/completion/README @@ -0,0 +1,10 @@ +notmuch completion + +This directory contains support for various shells to automatically +complete partially entered notmuch command lines. + +notmuch-completion.bash Command-line completion for the bash shell + +notmuch-completion.tcsh Command-line completion for the tcsh shell + +notmuch-completion.zsh Command-line completion for the zsh shell diff --git a/contrib/notmuch-completion.bash b/completion/notmuch-completion.bash similarity index 100% rename from contrib/notmuch-completion.bash rename to completion/notmuch-completion.bash diff --git a/contrib/notmuch-completion.tcsh b/completion/notmuch-completion.tcsh similarity index 100% rename from contrib/notmuch-completion.tcsh rename to completion/notmuch-completion.tcsh diff --git a/contrib/notmuch-completion.zsh b/completion/notmuch-completion.zsh similarity index 100% rename from contrib/notmuch-completion.zsh rename to completion/notmuch-completion.zsh From b5d8fe278425f7be49b6819e8187efffdffbd836 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 11:02:09 -0700 Subject: [PATCH 28/48] Makefile: Move the completion-specific commands to completion/Makefile.local For much better modularity. --- Makefile | 2 +- Makefile.local | 4 ---- completion/Makefile | 7 +++++++ completion/Makefile.local | 18 ++++++++++++++++++ 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 completion/Makefile create mode 100644 completion/Makefile.local diff --git a/Makefile b/Makefile index f3697861..076efc79 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all: # List all subdirectories here. Each contains its own Makefile.local -subdirs = compat emacs lib +subdirs = compat completion emacs lib # We make all targets depend on the Makefiles themselves. global_deps = Makefile Makefile.local \ diff --git a/Makefile.local b/Makefile.local index 5c264298..16b0103b 100644 --- a/Makefile.local +++ b/Makefile.local @@ -174,10 +174,6 @@ notmuch.1.gz: notmuch.1 install: all notmuch.1.gz mkdir -p $(DESTDIR)$(prefix)/share/man/man1 install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ - mkdir -p $(DESTDIR)$(bash_completion_dir) - install -m0644 contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch - mkdir -p $(DESTDIR)$(zsh_completion_dir) - install -m0644 contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch mkdir -p $(DESTDIR)$(prefix)/bin/ install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch ifeq ($(MAKECMDGOALS), install) diff --git a/completion/Makefile b/completion/Makefile new file mode 100644 index 00000000..b6859eac --- /dev/null +++ b/completion/Makefile @@ -0,0 +1,7 @@ +# See Makfefile.local for the list of files to be compiled in this +# directory. +all: + $(MAKE) -C .. all + +.DEFAULT: + $(MAKE) -C .. $@ diff --git a/completion/Makefile.local b/completion/Makefile.local new file mode 100644 index 00000000..6a6012d4 --- /dev/null +++ b/completion/Makefile.local @@ -0,0 +1,18 @@ +# -*- makefile -*- + +dir := completion + +# The dir variable will be re-assigned to later, so we can't use it +# directly in any shell commands. Instead we save its value in other, +# private variables that we can use in the commands. +bash_script := $(dir)/notmuch-completion.bash +zsh_script := $(dir)/notmuch-completion.zsh + +install: install-$(dir) + +install-$(dir): + @echo $@ + mkdir -p $(DESTDIR)$(bash_completion_dir) + install -m0644 $(bash_script) $(DESTDIR)$(bash_completion_dir)/notmuch + mkdir -p $(DESTDIR)$(zsh_completion_dir) + install -m0644 $(zsh_script) $(DESTDIR)$(zsh_completion_dir)/notmuch From d8192a4d7f0ece2a916364b079752e55754d3929 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 11:12:10 -0700 Subject: [PATCH 29/48] Move "config" test programs to "compat". It makes sense to me to have the little tests for functionality right next to the comptability implementations of that same functionality. But also, this means I can now tab-complete ./configure from the three initial characters (rather than the seven required previously). --- compat/README | 16 ++++++++++++++++ {config => compat}/have_getline.c | 0 config/README | 5 ----- configure | 4 ++-- 4 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 compat/README rename {config => compat}/have_getline.c (100%) delete mode 100644 config/README diff --git a/compat/README b/compat/README new file mode 100644 index 00000000..cd32c56f --- /dev/null +++ b/compat/README @@ -0,0 +1,16 @@ +notmuch/comapt + +This directory consists of two things: + +1. Small programs used by the notmuch configure script to test for the + availability of certain system features, (library functions, etc.). + + For example: have_getline.c + +2. Compatibility implementations of those system features for systems + that don't provide their own versions. + + For example: getline.c + + The compilation of these files is made conditional on the output of + the test programs from [1]. diff --git a/config/have_getline.c b/compat/have_getline.c similarity index 100% rename from config/have_getline.c rename to compat/have_getline.c diff --git a/config/README b/config/README deleted file mode 100644 index eabfe285..00000000 --- a/config/README +++ /dev/null @@ -1,5 +0,0 @@ -notmuch/config - -This directory consists of small programs used by the notmuch -configure script to test for the availability of certain system -features, (library functions, etc.). diff --git a/configure b/configure index ba205764..648d8771 100755 --- a/configure +++ b/configure @@ -250,7 +250,7 @@ EOF fi printf "Checking for getline... " -if ${CC} -o config/have_getline config/have_getline.c > /dev/null 2>&1 +if ${CC} -o compat/have_getline compat/have_getline.c > /dev/null 2>&1 then printf "Yes.\n" have_getline=1 @@ -258,7 +258,7 @@ else printf "No (will use our own instead).\n" have_getline=0 fi -rm -f config/have_getline +rm -f compat/have_getline cat < Date: Tue, 6 Apr 2010 11:28:24 -0700 Subject: [PATCH 30/48] packaging: Add a pointer to where the debian packaging really is. Most anyone familiar with debian should know to look for the top-level debian directory, but since we do have a "packaging" directory, I thought it should at least mention the debian stuff rather than just containing the fedora spec file. --- packaging/debian | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 packaging/debian diff --git a/packaging/debian b/packaging/debian new file mode 100644 index 00000000..a5866601 --- /dev/null +++ b/packaging/debian @@ -0,0 +1,2 @@ +The debian packaging exists in the top-level "debian" directory within +this source-code respository. From a3c9dfe4fae48f6107ef78516f7ab36396ca9f3e Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 12:39:29 -0700 Subject: [PATCH 31/48] configure: Add stub support for --build=-- option. I'm not sure that this option would actually be useful for anything, but debhelper at least expects our configure script to support it. So we'll accept it and ignore it. --- configure | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/configure b/configure index 648d8771..65a533f1 100755 --- a/configure +++ b/configure @@ -69,6 +69,11 @@ Fine tuning of some installation directories is available: --libdir=DIR Install libraries in LIBDIR [PREFIX/lib] +Additional options are accepted for compatibility with other +configure-script calling conventions, but don't do anything yet: + + --build=-- Currently ignored + EOF } @@ -81,6 +86,22 @@ for option; do PREFIX="${option#*=}" elif [ "${option%%=*}" = '--libdir' ] ; then LIBDIR="${option#*=}" + elif [ "${option%%=*}" = '--build' ] ; then + build_option="${option#*=}" + case ${build_option} in + *-*-*) ;; + *) + echo "Unrecognized value for --build option: ${build_option}" + echo "Should be: --" + echo "See:" + echo " $0 --help" + echo "" + exit 1 + esac + build_cpu=${build_option%%-*} + build_option=${build_option#*-} + build_vendor=${build_option%%-*} + build_os=${build_option#*-} else echo "Unrecognized option: ${option}." echo "See:" From c857b970e5cd53ae78543961735680c9b8e14341 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 12:40:38 -0700 Subject: [PATCH 32/48] configure: Avoid printing '.' at the end of error message. Since we're emitting the user's input back, let's leave it pristine and not confuse the issue by adding a final period. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 65a533f1..a2998411 100755 --- a/configure +++ b/configure @@ -103,7 +103,7 @@ for option; do build_vendor=${build_option%%-*} build_os=${build_option#*-} else - echo "Unrecognized option: ${option}." + echo "Unrecognized option: ${option}" echo "See:" echo " $0 --help" echo "" From 14e98e454e86d2322ecb6b9dc2364280cde4afbd Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 12:41:54 -0700 Subject: [PATCH 33/48] configure: Add support for a --includedir option Very similar to the existing --libdir option. --- configure | 10 ++++++++-- lib/Makefile.local | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure b/configure index a2998411..a0746dfa 100755 --- a/configure +++ b/configure @@ -67,7 +67,8 @@ specify an installation prefix other than $PREFIX using Fine tuning of some installation directories is available: - --libdir=DIR Install libraries in LIBDIR [PREFIX/lib] + --libdir=DIR Install libraries to DIR [PREFIX/lib] + --includedir=DIR Install header files to DIR [PREFIX/include] Additional options are accepted for compatibility with other configure-script calling conventions, but don't do anything yet: @@ -86,6 +87,8 @@ for option; do PREFIX="${option#*=}" elif [ "${option%%=*}" = '--libdir' ] ; then LIBDIR="${option#*=}" + elif [ "${option%%=*}" = '--includedir' ] ; then + INCLUDEDIR="${option#*=}" elif [ "${option%%=*}" = '--build' ] ; then build_option="${option#*=}" case ${build_option} in @@ -324,9 +327,12 @@ WARN_CFLAGS=\$(WARN_CXXFLAGS) -Wmissing-declarations # The prefix to which notmuch should be installed prefix = ${PREFIX} -# The directory to which notmuch libraries should be installed +# The directory to which libraries should be installed libdir = ${LIBDIR:=\$(prefix)/lib} +# The directory to which header files should be installed +includedir = ${INCLUDEDIR:=\$(prefix)/lib} + # The directory to which emacs lisp files should be installed emacs_lispdir=${emacs_lispdir} diff --git a/lib/Makefile.local b/lib/Makefile.local index 03a458b2..ed6b25f4 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -66,8 +66,8 @@ install-$(dir): install -m0644 $(dir)/$(LIBNAME) $(DESTDIR)$(libdir)/ ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME) ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME) - mkdir -p $(DESTDIR)$(prefix)/include/ - install -m0644 $(dir)/notmuch.h $(DESTDIR)$(prefix)/include/ + mkdir -p $(DESTDIR)$(includedir) + install -m0644 $(dir)/notmuch.h $(DESTDIR)$(includedir)/ SRCS := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs) CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a From 1d1ad74db9b85804fdec7e3311223caa7a591c82 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 12:47:16 -0700 Subject: [PATCH 34/48] configure: Add support for a --mandir option Again, nothing tricky here. --- Makefile.local | 4 ++-- configure | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.local b/Makefile.local index 16b0103b..1c3d5f5b 100644 --- a/Makefile.local +++ b/Makefile.local @@ -172,8 +172,8 @@ notmuch.1.gz: notmuch.1 .PHONY: install install: all notmuch.1.gz - mkdir -p $(DESTDIR)$(prefix)/share/man/man1 - install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ + mkdir -p $(DESTDIR)$(mandir)/man1 + install -m0644 notmuch.1.gz $(DESTDIR)$(mandir)/man1/ mkdir -p $(DESTDIR)$(prefix)/bin/ install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch ifeq ($(MAKECMDGOALS), install) diff --git a/configure b/configure index a0746dfa..b1e5f785 100755 --- a/configure +++ b/configure @@ -69,6 +69,7 @@ Fine tuning of some installation directories is available: --libdir=DIR Install libraries to DIR [PREFIX/lib] --includedir=DIR Install header files to DIR [PREFIX/include] + --mandir=DIR Install man pages to DIR [PREFIX/share/man] Additional options are accepted for compatibility with other configure-script calling conventions, but don't do anything yet: @@ -89,6 +90,8 @@ for option; do LIBDIR="${option#*=}" elif [ "${option%%=*}" = '--includedir' ] ; then INCLUDEDIR="${option#*=}" + elif [ "${option%%=*}" = '--mandir' ] ; then + MANDIR="${option#*=}" elif [ "${option%%=*}" = '--build' ] ; then build_option="${option#*=}" case ${build_option} in @@ -333,6 +336,9 @@ libdir = ${LIBDIR:=\$(prefix)/lib} # The directory to which header files should be installed includedir = ${INCLUDEDIR:=\$(prefix)/lib} +# The directory to which man pages should be installed +mandir = ${MANDIR:=\$(prefix)/share/man} + # The directory to which emacs lisp files should be installed emacs_lispdir=${emacs_lispdir} From ea43d06300b64aca2397ca77dfa526db6a2e3d9b Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 12:53:02 -0700 Subject: [PATCH 35/48] configure: Add a --sysconfdir option. Which means that the bash completion script will now install to ${prefix}/etc by default (unless configured with --syconfdir=/etc) which is probably the right thing to do. --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index b1e5f785..c52dd3bd 100755 --- a/configure +++ b/configure @@ -70,6 +70,7 @@ Fine tuning of some installation directories is available: --libdir=DIR Install libraries to DIR [PREFIX/lib] --includedir=DIR Install header files to DIR [PREFIX/include] --mandir=DIR Install man pages to DIR [PREFIX/share/man] + --sysconfdir=DIR Read-only single-machine data [PREFIX/etc] Additional options are accepted for compatibility with other configure-script calling conventions, but don't do anything yet: @@ -92,6 +93,8 @@ for option; do INCLUDEDIR="${option#*=}" elif [ "${option%%=*}" = '--mandir' ] ; then MANDIR="${option#*=}" + elif [ "${option%%=*}" = '--sysconfdir' ] ; then + SYSCONFDIR="${option#*=}" elif [ "${option%%=*}" = '--build' ] ; then build_option="${option#*=}" case ${build_option} in @@ -339,6 +342,9 @@ includedir = ${INCLUDEDIR:=\$(prefix)/lib} # The directory to which man pages should be installed mandir = ${MANDIR:=\$(prefix)/share/man} +# The directory to which read-only (configuration) filesshould be installed +sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc} + # The directory to which emacs lisp files should be installed emacs_lispdir=${emacs_lispdir} @@ -349,7 +355,7 @@ HAVE_EMACS = ${have_emacs} desktop_dir = \$(prefix)/share/applications # The directory to which bash completions files should be installed -bash_completion_dir = /etc/bash_completion.d +bash_completion_dir = \$(sysconfdir)/bash_completion.d # The directory to which zsh completions files should be installed zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix From a597c8b6ca7140e2a54b71eba86ea14d491582f9 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 13:04:08 -0700 Subject: [PATCH 36/48] configure: Ignore more options that debhelper expects. These include: --infodir=DIR --localstatedir=DIR --libexecdir=DIR --disable-maintainer-mode --disable-dependency-tracking --- configure | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/configure b/configure index c52dd3bd..fcaa373f 100755 --- a/configure +++ b/configure @@ -76,6 +76,11 @@ Additional options are accepted for compatibility with other configure-script calling conventions, but don't do anything yet: --build=-- Currently ignored + --infodir=DIR Currently ignored + --localstatedir=DIR Currently ignored + --libexecdir=DIR Currently ignored + --disable-maintainer-mode Currently ignored + --disable-dependency-tracking Currently ignored EOF } @@ -111,6 +116,16 @@ for option; do build_option=${build_option#*-} build_vendor=${build_option%%-*} build_os=${build_option#*-} + elif [ "${option%%=*}" = '--infodir' ] ; then + true + elif [ "${option%%=*}" = '--localstatedir' ] ; then + true + elif [ "${option%%=*}" = '--libexecdir' ] ; then + true + elif [ "${option}" = '--disable-maintainer-mode' ] ; then + true + elif [ "${option}" = '--disable-dependency-tracking' ] ; then + true else echo "Unrecognized option: ${option}" echo "See:" From bd5987ce39004d0a75a1758744f9a35710aaa1fd Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 14:09:31 -0700 Subject: [PATCH 37/48] Update Debian package version to 0.1-1. To make a Debian package for the recent 0.1 release of notmuch. --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a7f921c..7e58090d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -notmuch (0.0+201001211402) UNRELEASED; urgency=low +notmuch (0.1-1) unstable; urgency=low [ martin f. krafft ] * Add suggestion to vim-addon-manager. [ Carl Worth ] * Improve package description (closes: #566282). + * New upstream version (0.1) (closes: #576647). + * New versioning to track upstream version scheme. - -- Carl Worth Thu, 25 Feb 2010 11:16:19 -0800 + -- Carl Worth Tue, 06 Apr 2010 14:08:19 -0700 notmuch (0.0+201001211401) unstable; urgency=low From 53fa1ed0a89f2965e387e41509b998dad1e7ab82 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 14:18:05 -0700 Subject: [PATCH 38/48] Makefile: Add a disctclean target (simply calling clean) We currently don't distribute anything that's not already in git, so there's no difference between these two targets, (but debhelper wants to be able to call distclean). --- Makefile.local | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.local b/Makefile.local index 1c3d5f5b..bb5d6762 100644 --- a/Makefile.local +++ b/Makefile.local @@ -138,6 +138,11 @@ DEPS := $(DEPS:%.cc=.deps/%.d) clean: rm -f $(CLEAN); rm -rf .deps +# We don't (yet) have any distributed files not in the upstream repository. +# So distclean is currently identical to clean. +.PHONY: distclean +distclean: clean + notmuch_client_srcs = \ $(notmuch_compat_srcs) \ debugger.c \ From dfbec15b2388158693ab0dce0c7d348c4c5a98a5 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 15:05:13 -0700 Subject: [PATCH 39/48] Install emacs lisp files into a notmuch sub-directory of site-lisp. Now that we have multiple emacs-lisp source files, it's just more polite this way. --- configure | 15 ++++++++++----- debian/notmuch.install | 1 - emacs/Makefile.local | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/configure b/configure index fcaa373f..21780a61 100755 --- a/configure +++ b/configure @@ -71,6 +71,7 @@ Fine tuning of some installation directories is available: --includedir=DIR Install header files to DIR [PREFIX/include] --mandir=DIR Install man pages to DIR [PREFIX/share/man] --sysconfdir=DIR Read-only single-machine data [PREFIX/etc] + --emacslispdir=DIR Elisp [PREFIX/share/emacs/site-lisp/notmuch] Additional options are accepted for compatibility with other configure-script calling conventions, but don't do anything yet: @@ -100,6 +101,8 @@ for option; do MANDIR="${option#*=}" elif [ "${option%%=*}" = '--sysconfdir' ] ; then SYSCONFDIR="${option#*=}" + elif [ "${option%%=*}" = '--emacslispdir' ] ; then + EMACSLISPDIR="${option#*=}" elif [ "${option%%=*}" = '--build' ] ; then build_option="${option#*=}" case ${build_option} in @@ -214,10 +217,12 @@ else have_valgrind=0 fi -if pkg-config --modversion emacs > /dev/null 2>&1; then - emacs_lispdir=$(pkg-config emacs --variable sitepkglispdir) -else - emacs_lispdir='$(prefix)/share/emacs/site-lisp' +if [ -z "${EMACSLISPDIR}" ]; then + if pkg-config --modversion emacs > /dev/null 2>&1; then + EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)/notmuch + else + EMACSLISPDIR='$(prefix)/share/emacs/site-lisp/notmuch' + fi fi printf "Checking if emacs is available... " @@ -361,7 +366,7 @@ mandir = ${MANDIR:=\$(prefix)/share/man} sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc} # The directory to which emacs lisp files should be installed -emacs_lispdir=${emacs_lispdir} +emacslispdir=${EMACSLISPDIR} # Whether there's an emacs binary available for byte-compiling HAVE_EMACS = ${have_emacs} diff --git a/debian/notmuch.install b/debian/notmuch.install index f4124278..e69de29b 100644 --- a/debian/notmuch.install +++ b/debian/notmuch.install @@ -1 +0,0 @@ -notmuch.el usr/share/emacs/site-lisp/notmuch diff --git a/emacs/Makefile.local b/emacs/Makefile.local index 52aca4ef..e34da0be 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -20,10 +20,10 @@ install: install-emacs .PHONY: install-emacs install-emacs: - mkdir -p $(DESTDIR)/$(emacs_lispdir) - install -m0644 $(emacs_sources) $(DESTDIR)$(emacs_lispdir) + mkdir -p $(DESTDIR)$(emacslispdir) + install -m0644 $(emacs_sources) $(DESTDIR)$(emacslispdir) ifeq ($(HAVE_EMACS),1) - install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacs_lispdir) + install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacslispdir) endif CLEAN := $(CLEAN) $(emacs_bytecode) From ba8ee48dcb7dc972996a258401425855cafe4f71 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 16:28:01 -0700 Subject: [PATCH 40/48] debian: Fix broken symlinking of emacs lisp files. This broke when we changed from a single notmuch.el file to multiple notmuch-foo.el files. --- debian/notmuch.emacsen-install | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/notmuch.emacsen-install b/debian/notmuch.emacsen-install index 67602604..4982691e 100755 --- a/debian/notmuch.emacsen-install +++ b/debian/notmuch.emacsen-install @@ -28,12 +28,14 @@ install -m 755 -d ${ELCDIR} cd ${ELDIR} FILES=`echo *.el` cd ${ELCDIR} -ln -sf ${ELDIR}/${FILES} ${ELCDIR} +for file in ${FILES}; do + ln -sf ${ELDIR}/${file} . +done cat << EOF > path.el (setq load-path (cons "." load-path) byte-compile-warnings nil) EOF ${FLAVOR} ${FLAGS} ${FILES} -rm -f path.el +rm -f *.el exit 0 From ffd274e13584f37faed56582fec9a23e726972af Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 16:44:33 -0700 Subject: [PATCH 41/48] debian: Don't try compiling emacs bytecode for emacs < 21 It just doesn't work. --- debian/notmuch.emacsen-install | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/notmuch.emacsen-install b/debian/notmuch.emacsen-install index 4982691e..98ec1282 100755 --- a/debian/notmuch.emacsen-install +++ b/debian/notmuch.emacsen-install @@ -10,6 +10,12 @@ PACKAGE=notmuch if [ ${FLAVOR} = emacs ]; then exit 0; fi +# We know that the notmuch emacs code doesn't work with emacs before emacs23 +if [ ${FLAVOR} = emacs21 ]; then exit 0; fi +if [ ${FLAVOR} = emacs22 ]; then exit 0; fi +if [ ${FLAVOR} = xemacs21 ]; then exit 0; fi +if [ ${FLAVOR} = xemacs22 ]; then exit 0; fi + echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} #FLAVORTEST=`echo $FLAVOR | cut -c-6` From 33d8ecd85973c3bc814bbbffc41cbf32abc71bf9 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 17:53:04 -0700 Subject: [PATCH 42/48] debian: Fix Vcs-Browser link We're doing debian packaging in the primary repository now. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 39146dc6..932bb657 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~), pkg-config, libxapian-dev, libgmime-2.4-d Standards-Version: 3.8.3 Homepage: http://notmuchmail.org/ Vcs-Git: git://notmuchmail.org/git/notmuch -Vcs-Browser: http://git.debian.org/?p=collab-maint/notmuch.git;a=summary +Vcs-Browser: http://git.notmuchmail.org/git/notmuch Dm-Upload-Allowed: yes Package: notmuch From a1f67f28d73821df489e649e2345cfd19fc9e24f Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 17:53:48 -0700 Subject: [PATCH 43/48] debian: Split into multiple packages. The library goes into libnotmuch1 and the headers into libnotmuch-dev. --- debian/changelog | 3 ++- debian/control | 29 +++++++++++++++++++++++++++++ debian/libnotmuch-dev.install | 2 ++ debian/libnotmuch1.install | 1 + debian/notmuch.install | 5 +++++ 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 debian/libnotmuch-dev.install create mode 100644 debian/libnotmuch1.install diff --git a/debian/changelog b/debian/changelog index 7e58090d..ea4adf01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ notmuch (0.1-1) unstable; urgency=low * Improve package description (closes: #566282). * New upstream version (0.1) (closes: #576647). * New versioning to track upstream version scheme. + * Split packaging into notmuch, libnotmuch1, and libnotmuch-dev. - -- Carl Worth Tue, 06 Apr 2010 14:08:19 -0700 + -- Carl Worth Tue, 06 Apr 2010 18:07:08 -0700 notmuch (0.0+201001211401) unstable; urgency=low diff --git a/debian/control b/debian/control index 932bb657..7f8614d5 100644 --- a/debian/control +++ b/debian/control @@ -20,3 +20,32 @@ Description: thread-based email index, search and tagging large collections of email messages in maildir or mh format. It uses the Xapian library to provide fast, full-text search with a very convenient search syntax. + . + This package contains the notmuch command-line interface as well as + emacs and vim interfaces for notmuch. + +Package: libnotmuch1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: thread-based email index, search and tagging + Notmuch is a system for indexing, searching, reading, and tagging + large collections of email messages in maildir or mh format. It uses + the Xapian library to provide fast, full-text search with a very + convenient search syntax. + . + This package contains the runtime library, necessary to run + applications using libnotmuch. + +Package: libnotmuch-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, libnotmuch1 (= ${binary:Version}) +Description: thread-based email index, search and tagging + Notmuch is a system for indexing, searching, reading, and tagging + large collections of email messages in maildir or mh format. It uses + the Xapian library to provide fast, full-text search with a very + convenient search syntax. + . + This package provides the necessary development libraries and header + files to allow you to develop new software using libnotmuch. diff --git a/debian/libnotmuch-dev.install b/debian/libnotmuch-dev.install new file mode 100644 index 00000000..185dba4e --- /dev/null +++ b/debian/libnotmuch-dev.install @@ -0,0 +1,2 @@ +usr/include +usr/lib/libnotmuch.so diff --git a/debian/libnotmuch1.install b/debian/libnotmuch1.install new file mode 100644 index 00000000..da4fc25b --- /dev/null +++ b/debian/libnotmuch1.install @@ -0,0 +1 @@ +usr/lib/libnotmuch.so.* diff --git a/debian/notmuch.install b/debian/notmuch.install index e69de29b..dd310fad 100644 --- a/debian/notmuch.install +++ b/debian/notmuch.install @@ -0,0 +1,5 @@ +usr/bin +usr/share/emacs/site-lisp/notmuch/*.el +usr/share/man/man1 +etc/bash_completion.d +usr/share/zsh From 248e6f8c04ba88806ad7e8cd07f1c68493dc1a52 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 18:07:58 -0700 Subject: [PATCH 44/48] debian: Update standards version to 3.8.4. No changes needed. --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ea4adf01..cf6d618f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ notmuch (0.1-1) unstable; urgency=low * New upstream version (0.1) (closes: #576647). * New versioning to track upstream version scheme. * Split packaging into notmuch, libnotmuch1, and libnotmuch-dev. + * Update to advertise conformance with policy 3.8.4 (no changes). - -- Carl Worth Tue, 06 Apr 2010 18:07:08 -0700 + -- Carl Worth Tue, 06 Apr 2010 18:08:28 -0700 notmuch (0.0+201001211401) unstable; urgency=low diff --git a/debian/control b/debian/control index 7f8614d5..e50fa8b5 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Carl Worth Uploaders: Jameson Graef Rollins , martin f. krafft Build-Depends: debhelper (>= 7.0.50~), pkg-config, libxapian-dev, libgmime-2.4-dev, libtalloc-dev, libz-dev, emacs (>= 23~) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://notmuchmail.org/ Vcs-Git: git://notmuchmail.org/git/notmuch Vcs-Browser: http://git.notmuchmail.org/git/notmuch From e9e06d2d7c53a213afd2741ed27f6709230c6688 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 18:13:33 -0700 Subject: [PATCH 45/48] man: Fix several occurences of hyphen intended to be minus. With man pages we have to be careful or commands may not function after copy-and-paste. --- notmuch.1 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/notmuch.1 b/notmuch.1 index 9d0473d5..0e6a2edc 100644 --- a/notmuch.1 +++ b/notmuch.1 @@ -256,12 +256,12 @@ takes an existing set of messages and constructs a suitable mail template. The Reply-to header (if any, otherwise From:) is used for the To: address. Vales from the To: and Cc: headers are copied, but not including any of the current user's email addresses (as configured -in primary_mail or other_email in the .notmuch-config file) in the +in primary_mail or other_email in the .notmuch\-config file) in the recipient list It also builds a suitable new subject, including Re: at the front (if not already present), and adding the message IDs of the messages being -replied to to the References list and setting the In-Reply-To: field +replied to to the References list and setting the In\-Reply\-To: field correctly. Finally, the original contents of the emails are quoted by prefixing @@ -280,8 +280,8 @@ include .BR default Includes subject and quoted message body. .TP -.BR headers-only -Only produces In-Reply-To, References, To, Cc, and Bcc headers. +.BR headers\-only +Only produces In\-Reply\-To, References, To, Cc, and Bcc headers. .RE See the @@ -305,18 +305,18 @@ contents. .RS 4 .TP 4 -.BR tag " +|- [...] [--] ..." +.BR tag " +|\- [...] [\-\-] ..." Add/remove tags for all messages matching the search terms. -Tags prefixed by '+' are added while those prefixed by '-' are +Tags prefixed by '+' are added while those prefixed by '\-' are removed. For each message, tag removal is performed before tag addition. The beginning of is recognized by the first -argument that begins with neither '+' nor '-'. Support for -an initial search term beginning with '+' or '-' is provided -by allowing the user to specify a "--" argument to separate +argument that begins with neither '+' nor '\-'. Support for +an initial search term beginning with '+' or '\-' is provided +by allowing the user to specify a "\-\-" argument to separate the tags from the search terms. See the @@ -361,7 +361,7 @@ command can used to output a single part of a multi-part MIME message. .RS 4 .TP 4 -.BR part " --part= ..." +.BR part " \-\-part= ..." Output a single MIME part of a message. @@ -370,7 +370,7 @@ stdout. The search terms must match only a single message, otherwise this command will fail. The part number should match the part "id" field output by the -"--format=json" option of "notmuch show". If the message specified by +"\-\-format=json" option of "notmuch show". If the message specified by the search terms does not include a part with the specified "id" there will be no output. @@ -438,7 +438,7 @@ as well as any other tag values added manually with For .BR id: , -message ID values are the literal contents of the Message-ID: header +message ID values are the literal contents of the Message\-ID: header of email messages, but without the '<', '>' delimiters. The @@ -467,21 +467,21 @@ particular time range, (based on the Date: header) with a syntax of: .. Each timestamp is a number representing the number of seconds since -1970-01-01 00:00:00 UTC. This is not the most convenient means of +1970\-01\-01 00:00:00 UTC. This is not the most convenient means of expressing date ranges, but until notmuch is fixed to accept a more convenient form, one can use the date program to construct timestamps. For example, with the bash shell the folowing syntax would -specify a date range to return messages from 2009-10-01 until the +specify a date range to return messages from 2009\-10\-01 until the current time: - $(date +%s -d 2009-10-01)..$(date +%s) + $(date +%s \-d 2009\-10\-01)..$(date +%s) .SH ENVIRONMENT The following environment variables can be used to control the behavior of notmuch. .TP .B NOTMUCH_CONFIG Specifies the location of the notmuch configuration file. Notmuch will -use ${HOME}/.notmuch-config if this variable is not set. +use ${HOME}/.notmuch\-config if this variable is not set. .SH SEE ALSO The emacs-based interface to notmuch (available as .B notmuch.el From 66f00ab35ad3ce064bb1173c45fa9220f7d6a852 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 18:16:04 -0700 Subject: [PATCH 46/48] debian: Modify each package description slightly. This avoids a lintian complaint about several packages with identical package descriptions. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index e50fa8b5..e4c61ab3 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Package: libnotmuch1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: thread-based email index, search and tagging +Description: thread-based email index, search and tagging (runtime) Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses the Xapian library to provide fast, full-text search with a very @@ -41,7 +41,7 @@ Package: libnotmuch-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, libnotmuch1 (= ${binary:Version}) -Description: thread-based email index, search and tagging +Description: thread-based email index, search and tagging (development) Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses the Xapian library to provide fast, full-text search with a very From ae9d67fd810e021e1d27c24c487ffd6c34b8ecdc Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 18:20:20 -0700 Subject: [PATCH 47/48] Avoid needlessly linking final notmuch binary against libXapian. The libnotmuch.so library already does, so we don't need to do it again. (Thanks to a Debian debhelper warning for pointing this out.) --- Makefile.local | 7 ++++--- lib/Makefile.local | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.local b/Makefile.local index bb5d6762..b38370cc 100644 --- a/Makefile.local +++ b/Makefile.local @@ -41,7 +41,8 @@ extra_cxxflags := # Smash together user's values with our extra values FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) -FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) +FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch +FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) .PHONY: all all: notmuch notmuch-shared notmuch.1.gz @@ -167,10 +168,10 @@ notmuch_client_srcs = \ notmuch_client_modules = $(notmuch_client_srcs:.c=.o) notmuch: $(notmuch_client_modules) lib/libnotmuch.a - $(call quiet,CC $(CFLAGS)) $^ $(FINAL_LDFLAGS) -o $@ + $(call quiet,CC $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@ notmuch-shared: $(notmuch_client_modules) lib/libnotmuch.so - $(call quiet,CC $(CFLAGS)) -Llib -lnotmuch $(notmuch_client_modules) $(FINAL_LDFLAGS) -o $@ + $(call quiet,CC $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@ notmuch.1.gz: notmuch.1 gzip --stdout $^ > $@ diff --git a/lib/Makefile.local b/lib/Makefile.local index ed6b25f4..0e3a4d15 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -51,7 +51,7 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) $(call quiet,AR) rcs $@ $^ $(dir)/$(LIBNAME): $(libnotmuch_modules) - $(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@ + $(call quiet,CXX $(CXXFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -shared -Wl,-soname=$(SONAME) -o $@ $(dir)/$(SONAME): $(dir)/$(LIBNAME) ln -sf $(LIBNAME) $@ From e7837ace186a09508140193c1dabe3317dadf797 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 18:27:22 -0700 Subject: [PATCH 48/48] debian: Add a watch file. To help people pester me in the case of uploading a new upstream release without a corresponding Debian package. --- debian/changelog | 3 ++- debian/watch | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index cf6d618f..2f0a17e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ notmuch (0.1-1) unstable; urgency=low * New versioning to track upstream version scheme. * Split packaging into notmuch, libnotmuch1, and libnotmuch-dev. * Update to advertise conformance with policy 3.8.4 (no changes). + * Add a debian/watch file to notice upstream tar files. - -- Carl Worth Tue, 06 Apr 2010 18:08:28 -0700 + -- Carl Worth Tue, 06 Apr 2010 18:27:49 -0700 notmuch (0.0+201001211401) unstable; urgency=low diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..06a1d973 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 + +# Notmuch releases appear here +http://www.notmuchmail.org/releases/notmuch-(.*)\.tar\.gz