From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id AE1D86DE0C3D for ; Mon, 9 Dec 2019 10:49:21 -0800 (PST) Authentication-Results: arlo.cworth.org; dkim=permerror (0-bit key) header.d=fifthhorseman.net header.i=@fifthhorseman.net header.b="8Q9KnQTV"; dkim=pass (2048-bit key; unprotected) header.d=fifthhorseman.net header.i=@fifthhorseman.net header.b="aIkr4e0Y"; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -1.507 X-Spam-Level: X-Spam-Status: No, score=-1.507 tagged_above=-999 required=5 tests=[AWL=0.994, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rJJLR1Cw9xK9 for ; Mon, 9 Dec 2019 10:49:19 -0800 (PST) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id 889946DE0BF6 for ; Mon, 9 Dec 2019 10:49:19 -0800 (PST) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1575917358; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=tPKSorRrT3/ajZEa0U+hyRn5d50BeXNS7Sto/dfFh5Q=; b=8Q9KnQTVdvqR6JXOK9UssCESmcmFTZ/1EsCh8WtCaQx8Uk9wC6O80Jh/ JTcC3XNHH4fmGnXf8Q5eXgaiL3HQCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1575917358; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=tPKSorRrT3/ajZEa0U+hyRn5d50BeXNS7Sto/dfFh5Q=; b=aIkr4e0YTell0iwKfSfrrESIqlmUp7WyjcshaQerg7RjnfHkSQaKkVF2 gd8m4iU4kacSfC3jobSVIfCir8OxWTSKLEm20lQz+bWxXBuLBsF8Jc2EYH JxBkd8jZd4rSgDu+oiCvZ+iip0tB5rm8rAxylYBpSZRqYLP2qVj1oWFEJl aoF74jJhL2BYV/NY2g4VkspifC6XDB5chhazT4TDLu8gdO12kbPNCQWoW0 Kr4Ynl7Yih5QZHctrtPQvoBtc1jc6TxiZ52eAEao6+p2aG9cfPcVRM+Hin KG9c9i+NHD6xN9BQWWV35DXM2ZJfA5q/sBu1gfJEs/VmowBJyNRMBw== Received: from fifthhorseman.net (unknown [38.109.115.130]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id CC02DF9A8 for ; Mon, 9 Dec 2019 13:49:18 -0500 (EST) Received: by fifthhorseman.net (Postfix, from userid 1000) id CE1C2205B4; Mon, 9 Dec 2019 13:49:15 -0500 (EST) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH 3/4] debian elpa-notmuch: ship elisp and .png from "make install" Date: Mon, 9 Dec 2019 13:49:09 -0500 Message-Id: <20191209184910.242808-4-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191209184910.242808-1-dkg@fifthhorseman.net> References: <20191209184910.242808-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2019 18:49:21 -0000 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 --- 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