From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 6FPfJWx9rmaHOAAA62LTzQ:P1 (envelope-from ) for ; Sat, 03 Aug 2024 18:56:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 6FPfJWx9rmaHOAAA62LTzQ (envelope-from ) for ; Sat, 03 Aug 2024 20:56:44 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=ZdwEqZko; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722711404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Lrms6Bv1GKpMT6O6j33lPevsyNLS1y0/wPImI33htOw=; b=Gkz5+GDPfD+blBVsuhKVGw1AQ8I4fFEKW4bKI1eu3MglwjUOHtYYVQ96geMvCOkHHqWhr0 tsJhUoRfQYeGszbA/4kNkILSwT4tnjw20Q0Vd5WjFWVAVE/V4Mnh0E95lpMCQo3I+SGDyr zTJDLRBdIVbblVZ+SZASsVMt0itFNO89n0AbT7ovVL6zEJ3V00VekzTBSMQUHh6SCd10d5 2Z0y2RGoSlitz/jOHUA/01H/ELIbORryEwICsEGzyDERSDw5iyytOD9JMu6YP3pFYzZJod kVeOaiAIhkerYN8WPbqRovrIAjciP1W/y6Y6x/nTpubxNnCFvWEdZ3Iyn3BNHQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722711404; a=rsa-sha256; cv=none; b=L9uVt3tDKYuwzrnPkn7JdAjuDIZdaqIL0m/5OAboTxI7Hxfhje9y9VmCug8KUSXnoDRKnk VPFoSCj7k/MUKbk8bncB4VDIMsjczOiS/pdAOB2N+3P6gF1hayDmKT5veuy28UDwyfxtUI Zr1h/s6kLtn/xE3D/5/bZwWRLpF69KehqjOQCnUGghYhjG7hW0U2eRgp1KTTY01V6RvIPI cT4ias77o3RiVltE6+IzOC0Qvl1q/IpDUKgJXcv1p7sixsRoy5JnGEiUgMDN1nK/43PEcx msK2QJZR+ec+m3NN5MyjINhjip/lkja+P1l/B92qabH2fSMGrJ/Vgqj0L6kNtw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20230601 header.b=ZdwEqZko; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 694A978E15 for ; Sat, 03 Aug 2024 20:56:44 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 945175F826; Sat, 3 Aug 2024 18:56:41 +0000 (UTC) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) by mail.notmuchmail.org (Postfix) with ESMTPS id 71A805F370 for ; Sat, 3 Aug 2024 18:56:38 +0000 (UTC) Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-7a1e2ac1ee5so588319785a.2 for ; Sat, 03 Aug 2024 11:56:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722711397; x=1723316197; darn=notmuchmail.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HTjHH9Pf1BUIhXkTXR4rsxaRgBGWwsrbJiSDexQ+TmA=; b=ZdwEqZkolRxoxJw7wjpzjcXf5lsE4wbbj+68mnUZU7wmvbHpdZjQ4tebaiXE5vlRzX YwUWQ6QLEg5WjsyE62s3zKQDPjfMCxxrQ8UZ+03/74+8mJ/jKl68DKYa+6yulta26Kbf C0fmbNF+wT3/CELinXLH7KvXFE/Rlv1VhDX6PG6hq1HMx4DJekpBAf92pa720/azDJKL GUEbT5fWS2w9MjaJEh6cPblj7iyzZvCamJYRkdr3VX0HHnpUbwATy4CmYzozq5va53H0 bHKEQmz9VKQbXbkC4TH0SJctTeQcWxCDp/fLzNyTpvkadA9ZMDaKhKqgWnXLzOpZ1yki k7Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722711397; x=1723316197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HTjHH9Pf1BUIhXkTXR4rsxaRgBGWwsrbJiSDexQ+TmA=; b=FeGkh/HFPUohZry82tdJmvAI1XZv0G49m7guwmSpw5vSGuzSSWG2T4EFkJTf+rmC3Z z6He1NnSJw/egpGs1WRUUd05J6YydID0BqAlnxgcPCG9eQhL+Uha77h2k2hf2GCpq98X XrrypaOyklvQBOpV8GRnLEPlKiX3RYoMYaf47SuaRr/6CRhFDYTvgcXIeWKgLXJPcGQi TB0i1p3HcqcpmrW/36DdS3FAsIkuYSB/Pw6REcG/jFhYL3ljnQ6WyiWgqp4O/P3jWXe1 gcKHMEt8rJ32UHT2mP0jn2o0j2eqN/WzZ2ZbOwqR8fob09J7rUtpNQPYXewXEIcckdvF c3EQ== X-Gm-Message-State: AOJu0Yw461h/EQAz1KHDEZVK1SyOqbtdNS74GQ9hwnNQB/0XwLBfbkUP PzR1T6T8QWCKu9Aqj0GAaveVmKX38N/y6vZz+dYuNO0VLRy8G9iozickhA== X-Google-Smtp-Source: AGHT+IGwKWn+3Ln8O3T/CkIFeDTTJRFj3FmU0mJcM+fPDHViYD1LBfDHV20RxsrLzwYl9/gVVOYX6g== X-Received: by 2002:a05:620a:2484:b0:7a1:9a00:9aaf with SMTP id af79cd13be357-7a34efe2322mr850361385a.55.1722711397090; Sat, 03 Aug 2024 11:56:37 -0700 (PDT) Received: from digitalmercury.freeddns.org ([65.94.65.21]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a34f796871sm193512785a.132.2024.08.03.11.56.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 11:56:36 -0700 (PDT) From: Nicholas D Steeves X-Google-Original-From: Nicholas D Steeves To: notmuch@notmuchmail.org Subject: [PATCH 1/4] Convert notmuch-vim to Vim addon policy 2.0 Date: Sat, 3 Aug 2024 14:56:06 -0400 Message-Id: <20240803185609.2020351-2-sten@debian.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240803185609.2020351-1-sten@debian.org> References: <20240803185609.2020351-1-sten@debian.org> MIME-Version: 1.0 Message-ID-Hash: OKYGAS7GQFI3L4DVVCGK37FMEPFF4QDA X-Message-ID-Hash: OKYGAS7GQFI3L4DVVCGK37FMEPFF4QDA X-MailFrom: nsteeves@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: James McCoy X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE X-Migadu-Spam-Score: 0.27 X-Spam-Score: 0.27 X-Migadu-Queue-Id: 694A978E15 X-Migadu-Scanner: mx11.migadu.com X-TUID: pS6gntcVC/Bq From: James McCoy The new Vim addon policy relies on Vim's native package functionality, rather than the Debian-specific vim-addons tool. This allows the addon to be immediately available when the package is installed, rather than requiring extra setup by the user. * Install notmuch-vim to its own /usr/share/notmuch-vim directory, so the files are self-contained. * Remove vim-addon-manager from notmuch-vim Depends * Add ${vim-addon:Depends} to notmuch-vim Depends to ensure it has the required relationships on Vim/Neovim. * Build-Depend on dh-sequence-vim-addon to automatically setup the required symlinks for Vim and Neovim to see the addon. Signed-off-by: James McCoy --- debian/control | 3 ++- debian/notmuch-vim.dirs | 4 ---- debian/notmuch-vim.install | 5 +---- debian/notmuch-vim.neovim-addon | 1 + debian/notmuch-vim.vim-addon | 1 + debian/rules | 1 + 6 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 debian/notmuch-vim.dirs create mode 120000 debian/notmuch-vim.neovim-addon create mode 100644 debian/notmuch-vim.vim-addon diff --git a/debian/control b/debian/control index 4fded909..77096b85 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), dh-elpa (>= 1.3), dh-python, + dh-sequence-vim-addon, desktop-file-utils, doxygen, dpkg-dev (>= 1.17.14), @@ -211,9 +212,9 @@ Replaces: Depends: notmuch, ruby-notmuch, - vim-addon-manager, vim-ruby, ${misc:Depends}, + ${vim-addon:Depends}, Recommends: ruby-mail, Description: thread-based email index, search and tagging (vim interface) diff --git a/debian/notmuch-vim.dirs b/debian/notmuch-vim.dirs deleted file mode 100644 index 2b531314..00000000 --- a/debian/notmuch-vim.dirs +++ /dev/null @@ -1,4 +0,0 @@ -usr/share/vim/addons/doc -usr/share/vim/addons/plugin -usr/share/vim/addons/syntax -usr/share/vim/registry diff --git a/debian/notmuch-vim.install b/debian/notmuch-vim.install index cf898738..08096d37 100644 --- a/debian/notmuch-vim.install +++ b/debian/notmuch-vim.install @@ -1,4 +1 @@ -vim/notmuch.txt usr/share/vim/addons/doc -vim/notmuch.vim usr/share/vim/addons/plugin -vim/notmuch.yaml usr/share/vim/registry -vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax +/usr/share/notmuch-vim diff --git a/debian/notmuch-vim.neovim-addon b/debian/notmuch-vim.neovim-addon new file mode 120000 index 00000000..a576db7c --- /dev/null +++ b/debian/notmuch-vim.neovim-addon @@ -0,0 +1 @@ +notmuch-vim.vim-addon \ No newline at end of file diff --git a/debian/notmuch-vim.vim-addon b/debian/notmuch-vim.vim-addon new file mode 100644 index 00000000..9c23ba18 --- /dev/null +++ b/debian/notmuch-vim.vim-addon @@ -0,0 +1 @@ +/usr/share/notmuch-vim notmuch diff --git a/debian/rules b/debian/rules index a77ffa15..ecf09abc 100755 --- a/debian/rules +++ b/debian/rules @@ -37,4 +37,5 @@ override_dh_auto_install: PYBUILD_NAME=notmuch dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python PYBUILD_NAME=notmuch2 dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python-cffi $(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C vim prefix=/usr/share/notmuch-vim DESTDIR=$(CURDIR)/debian/tmp install dh_auto_install --sourcedirectory bindings/ruby -- 2.39.2