From 2fd4e76006a44e11659d7723a75c6ba05c3c85b5 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 16 Sep 2018 14:08:09 -0300 Subject: [PATCH] debian: update notmuch-mutt packaging to use install target --- debian/notmuch-mutt.install | 4 ++-- debian/notmuch-mutt.manpages | 2 +- debian/notmuch.install | 4 ++-- debian/notmuch.manpages | 18 ++++++++++++++++++ debian/rules | 1 + 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 debian/notmuch.manpages diff --git a/debian/notmuch-mutt.install b/debian/notmuch-mutt.install index 9141c26f..9b468bdb 100644 --- a/debian/notmuch-mutt.install +++ b/debian/notmuch-mutt.install @@ -1,2 +1,2 @@ -contrib/notmuch-mutt/notmuch-mutt usr/bin -contrib/notmuch-mutt/notmuch-mutt.rc etc/Muttrc.d +usr/bin/notmuch-mutt +etc/Muttrc.d/notmuch-mutt.rc diff --git a/debian/notmuch-mutt.manpages b/debian/notmuch-mutt.manpages index 3f6b8abd..a14ed69b 100644 --- a/debian/notmuch-mutt.manpages +++ b/debian/notmuch-mutt.manpages @@ -1 +1 @@ -contrib/notmuch-mutt/notmuch-mutt.1 +usr/share/man/man1/notmuch-mutt.1 diff --git a/debian/notmuch.install b/debian/notmuch.install index 31b9a37e..e32e1ac6 100644 --- a/debian/notmuch.install +++ b/debian/notmuch.install @@ -1,3 +1,3 @@ -usr/bin -usr/share/man +usr/bin/notmuch +usr/bin/notmuch-emacs-mua usr/share/bash-completion diff --git a/debian/notmuch.manpages b/debian/notmuch.manpages new file mode 100644 index 00000000..f9fcb54a --- /dev/null +++ b/debian/notmuch.manpages @@ -0,0 +1,18 @@ +usr/share/man/man5/notmuch-hooks.5.gz +usr/share/man/man1/notmuch-dump.1.gz +usr/share/man/man1/notmuch-count.1.gz +usr/share/man/man1/notmuch-compact.1.gz +usr/share/man/man1/notmuch-emacs-mua.1.gz +usr/share/man/man1/notmuch-new.1.gz +usr/share/man/man1/notmuch.1.gz +usr/share/man/man1/notmuch-reindex.1.gz +usr/share/man/man1/notmuch-address.1.gz +usr/share/man/man1/notmuch-tag.1.gz +usr/share/man/man1/notmuch-reply.1.gz +usr/share/man/man1/notmuch-search.1.gz +usr/share/man/man1/notmuch-restore.1.gz +usr/share/man/man1/notmuch-insert.1.gz +usr/share/man/man1/notmuch-show.1.gz +usr/share/man/man1/notmuch-config.1.gz +usr/share/man/man7/notmuch-properties.7.gz +usr/share/man/man7/notmuch-search-terms.7.gz diff --git a/debian/rules b/debian/rules index 1ac6498c..07b755c0 100755 --- a/debian/rules +++ b/debian/rules @@ -31,4 +31,5 @@ override_dh_auto_install: dh_auto_install dh_auto_install --sourcedirectory bindings/python cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp + $(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install dh_auto_install --sourcedirectory bindings/ruby