unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH 3/4] debian elpa-notmuch: ship elisp and .png from "make install"
Date: Mon,  9 Dec 2019 13:49:09 -0500	[thread overview]
Message-ID: <20191209184910.242808-4-dkg@fifthhorseman.net> (raw)
In-Reply-To: <20191209184910.242808-1-dkg@fifthhorseman.net>

Rather than ship from the source directories, ship these files from
where they're installed by "make install".

This doesn't resolve all the dh_missing warnings yet (due to #946142),
but it leaves the last bit of that problem in the hands of the dh-elpa
package, and it's not due to notmuch's packaging any longer.

Note that notmuch-pkg.el is only relevant for elpa, so it was not
installed by "make install", and has to be extracted deliberately from
the source tree.

Note also that we now don't ship make-deps.el or rstdoc.el, as these
are build tools and don't belong in the deployed package.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
 debian/elpa-notmuch.elpa | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/elpa-notmuch.elpa b/debian/elpa-notmuch.elpa
index a924468a..4712b73f 100644
--- a/debian/elpa-notmuch.elpa
+++ b/debian/elpa-notmuch.elpa
@@ -1,2 +1,3 @@
-emacs/*.el
-emacs/notmuch-logo.png
+debian/tmp/usr/share/emacs/site-lisp/*.el
+debian/tmp/usr/share/emacs/site-lisp/notmuch-logo.png
+emacs/notmuch-pkg.el
-- 
2.24.0

  parent reply	other threads:[~2019-12-09 18:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-09 18:49 Complete Debian packaging transition to dh 12 Daniel Kahn Gillmor
2019-12-09 18:49 ` [PATCH 1/4] debian: record upstream files which should not be installed by the package Daniel Kahn Gillmor
2019-12-09 18:49 ` [PATCH 2/4] debian: ship info files in the standard location Daniel Kahn Gillmor
2019-12-09 18:49 ` Daniel Kahn Gillmor [this message]
2019-12-09 18:49 ` [PATCH 4/4] debian: move packaging to dh 12 Daniel Kahn Gillmor
2019-12-20 18:10 ` Complete Debian packaging transition " Antoine Beaupré
2019-12-21  0:14 ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191209184910.242808-4-dkg@fifthhorseman.net \
    --to=dkg@fifthhorseman.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).