debian: update notmuch-mutt packaging to use install target

diff --git a/debian/notmuch-mutt.install b/debian/notmuch-mutt.install
index 9141c26f284a45932393c856e5bd4a9f99f106fd..9b468bdb0fecec74097a034dbb26242e263ff435 100644 (file)
--- 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 3f6b8abdae2f5cff6747e22b8de1393244747bb7..a14ed69b36d730b31ab60de64c8fc8886a2e38ee 100644 (file)
--- 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 31b9a37eb18f10b004b2a95b67e7e1c676515209..e32e1ac67dcc1ecce9371fa96dab9ea635380af8 100644 (file)
--- 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 (file)
index 0000000..f9fcb54
--- /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 1ac6498ca49fb8e50c4cb9caa79904d36621951d..07b755c0f9f174c47b9570d5c1b3bd8f1439914a 100755 (executable)
--- 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