* Debian packaging cleanup
@ 2019-11-10 17:37 Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 1/6] Standards-Version: bump to 4.4.1 (no changes needed) Daniel Kahn Gillmor
` (6 more replies)
0 siblings, 7 replies; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-10 17:37 UTC (permalink / raw)
To: Notmuch Mail
This series offers a set of simple and small changes to the debian
packaging for notmuch. they apply to the master branch.
I've reviewed these changes, and tested a build with them with no
problems.
A modern, canonicalized debian package is easier to work with.
Please consider applying these changes! If you're uncomfortable with
any of them, I'm happy to hear feedback.
--dkg
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/6] Standards-Version: bump to 4.4.1 (no changes needed)
2019-11-10 17:37 Debian packaging cleanup Daniel Kahn Gillmor
@ 2019-11-10 17:37 ` Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 2/6] Rules-Requires-Root: no (we do nothing as root during package build) Daniel Kahn Gillmor
` (5 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-10 17:37 UTC (permalink / raw)
To: Notmuch Mail
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index b1829582..b7bffc71 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends:
gnupg <!nocheck>,
bash-completion (>=1.9.0~),
texinfo
-Standards-Version: 4.3.0
+Standards-Version: 4.4.1
Homepage: https://notmuchmail.org/
Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
Vcs-Browser: https://git.notmuchmail.org/git/notmuch
--
2.24.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/6] Rules-Requires-Root: no (we do nothing as root during package build)
2019-11-10 17:37 Debian packaging cleanup Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 1/6] Standards-Version: bump to 4.4.1 (no changes needed) Daniel Kahn Gillmor
@ 2019-11-10 17:37 ` Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 3/6] Move to dh 12 Daniel Kahn Gillmor
` (4 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-10 17:37 UTC (permalink / raw)
To: Notmuch Mail
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index b7bffc71..efb54abe 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,7 @@ Standards-Version: 4.4.1
Homepage: https://notmuchmail.org/
Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
Vcs-Browser: https://git.notmuchmail.org/git/notmuch
+Rules-Requires-Root: no
Package: notmuch
Architecture: any
--
2.24.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/6] Move to dh 12
2019-11-10 17:37 Debian packaging cleanup Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 1/6] Standards-Version: bump to 4.4.1 (no changes needed) Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 2/6] Rules-Requires-Root: no (we do nothing as root during package build) Daniel Kahn Gillmor
@ 2019-11-10 17:37 ` Daniel Kahn Gillmor
2019-12-03 12:10 ` David Bremner
2019-11-10 17:37 ` [PATCH 4/6] wrap-and-sort -ast (for canonicalized debian metadata) Daniel Kahn Gillmor
` (3 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-10 17:37 UTC (permalink / raw)
To: Notmuch Mail
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/compat | 1 -
debian/control | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de3947..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index efb54abe..a4ac228e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]
Build-Depends:
dpkg-dev (>= 1.17.14),
- debhelper (>= 11~),
+ debhelper-compat (= 12),
pkg-config,
libxapian-dev,
libgmime-3.0-dev (>= 3.0.3~),
--
2.24.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/6] wrap-and-sort -ast (for canonicalized debian metadata)
2019-11-10 17:37 Debian packaging cleanup Daniel Kahn Gillmor
` (2 preceding siblings ...)
2019-11-10 17:37 ` [PATCH 3/6] Move to dh 12 Daniel Kahn Gillmor
@ 2019-11-10 17:37 ` Daniel Kahn Gillmor
2019-12-04 7:07 ` [PATCH 4/6 v2] wrap-and-sort -ast Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 5/6] debian/copyright: use secure git URL Daniel Kahn Gillmor
` (2 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-10 17:37 UTC (permalink / raw)
To: Notmuch Mail
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/control | 103 ++++++++++++++++++++++++------------
debian/notmuch-mutt.install | 2 +-
debian/notmuch-vim.dirs | 4 +-
debian/notmuch-vim.install | 4 +-
debian/notmuch.install | 2 +-
debian/notmuch.manpages | 18 +++----
6 files changed, 84 insertions(+), 49 deletions(-)
diff --git a/debian/control b/debian/control
index a4ac228e..91906972 100644
--- a/debian/control
+++ b/debian/control
@@ -4,30 +4,32 @@ Priority: optional
Maintainer: Carl Worth <cworth@debian.org>
Uploaders:
Jameson Graef Rollins <jrollins@finestructure.net>,
- David Bremner <bremner@debian.org>
-Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]
+ David Bremner <bremner@debian.org>,
+Build-Conflicts:
+ gdb [ia64 mips mips64el],
+ gdb-minimal,
+ ruby1.8,
Build-Depends:
- dpkg-dev (>= 1.17.14),
+ bash-completion (>=1.9.0~),
debhelper-compat (= 12),
- pkg-config,
- libxapian-dev,
+ dh-elpa (>= 1.3),
+ dh-python,
+ dpkg-dev (>= 1.17.14),
+ dtach (>= 0.8) <!nocheck>,
+ emacs-nox | emacs-gtk | emacs-lucid | emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) | emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
+ gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
+ gnupg <!nocheck>,
+ gpgsm <!nocheck>,
libgmime-3.0-dev (>= 3.0.3~),
libtalloc-dev,
+ libxapian-dev,
libz-dev,
+ pkg-config,
python3-all (>= 3.1.2-7~),
- dh-python,
- dh-elpa (>= 1.3),
python3-sphinx,
- ruby, ruby-dev (>>1:1.9.3~),
- emacs-nox | emacs-gtk | emacs-lucid |
- emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
- emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
- gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
- dtach (>= 0.8) <!nocheck>,
- gpgsm <!nocheck>,
- gnupg <!nocheck>,
- bash-completion (>=1.9.0~),
- texinfo
+ ruby,
+ ruby-dev (>>1:1.9.3~),
+ texinfo,
Standards-Version: 4.4.1
Homepage: https://notmuchmail.org/
Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
@@ -36,8 +38,14 @@ Rules-Requires-Root: no
Package: notmuch
Architecture: any
-Depends: libnotmuch5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: elpa-notmuch | notmuch-vim | notmuch-mutt | alot, gnupg-agent, gpgsm
+Depends:
+ libnotmuch5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ elpa-notmuch | notmuch-vim | notmuch-mutt | alot,
+ gnupg-agent,
+ gpgsm,
Description: thread-based email index, search and tagging
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -49,8 +57,11 @@ Description: thread-based email index, search and tagging
Package: libnotmuch5
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Pre-Depends:
+ ${misc:Pre-Depends},
Description: thread-based email index, search and tagging (runtime)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -63,7 +74,9 @@ Description: thread-based email index, search and tagging (runtime)
Package: libnotmuch-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libnotmuch5 (= ${binary:Version})
+Depends:
+ libnotmuch5 (= ${binary:Version}),
+ ${misc:Depends},
Description: thread-based email index, search and tagging (development)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -76,7 +89,10 @@ Description: thread-based email index, search and tagging (development)
Package: python3-notmuch
Architecture: all
Section: python
-Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch5 (>= ${source:Version})
+Depends:
+ libnotmuch5 (>= ${source:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
Description: Python 3 interface to the notmuch mail search and index library
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -89,7 +105,9 @@ Description: Python 3 interface to the notmuch mail search and index library
Package: ruby-notmuch
Architecture: any
Section: ruby
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Ruby interface to the notmuch mail search and index library
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -102,13 +120,17 @@ Description: Ruby interface to the notmuch mail search and index library
Package: notmuch-emacs
Section: oldlibs
Architecture: all
-Depends: elpa-notmuch, ${misc:Depends}
+Depends:
+ elpa-notmuch,
+ ${misc:Depends},
Description: thread-based email index, search and tagging (transitional package)
This dummy package help ease transition to the new package elpa-notmuch
Package: elpa-notmuch
Architecture: all
-Depends: ${misc:Depends}, ${elpa:Depends}
+Depends:
+ ${elpa:Depends},
+ ${misc:Depends},
Description: thread-based email index, search and tagging (emacs interface)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -120,10 +142,18 @@ Description: thread-based email index, search and tagging (emacs interface)
Package: notmuch-vim
Architecture: all
-Breaks: notmuch (<<0.6~254~)
-Replaces: notmuch (<<0.6~254~)
-Depends: ${misc:Depends}, notmuch, vim-addon-manager, vim-ruby, ruby-notmuch
-Recommends: ruby-mail
+Breaks:
+ notmuch (<<0.6~254~),
+Replaces:
+ notmuch (<<0.6~254~),
+Depends:
+ notmuch,
+ ruby-notmuch,
+ vim-addon-manager,
+ vim-ruby,
+ ${misc:Depends},
+Recommends:
+ ruby-mail,
Description: thread-based email index, search and tagging (vim interface)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -136,13 +166,18 @@ Description: thread-based email index, search and tagging (vim interface)
Package: notmuch-mutt
Architecture: all
Depends:
+ libmail-box-perl,
+ libmailtools-perl,
+ libstring-shellquote-perl,
+ libterm-readline-gnu-perl,
notmuch (>= 0.4),
- libmail-box-perl, libmailtools-perl,
- libstring-shellquote-perl, libterm-readline-gnu-perl,
${misc:Depends},
${perl:Depends},
-Recommends: mutt
-Enhances: notmuch, mutt
+Recommends:
+ mutt,
+Enhances:
+ mutt,
+ notmuch,
Description: thread-based email index, search and tagging (Mutt interface)
notmuch-mutt provides integration among the Mutt mail user agent and
the Notmuch mail indexer.
diff --git a/debian/notmuch-mutt.install b/debian/notmuch-mutt.install
index 9b468bdb..8314f883 100644
--- a/debian/notmuch-mutt.install
+++ b/debian/notmuch-mutt.install
@@ -1,2 +1,2 @@
-usr/bin/notmuch-mutt
etc/Muttrc.d/notmuch-mutt.rc
+usr/bin/notmuch-mutt
diff --git a/debian/notmuch-vim.dirs b/debian/notmuch-vim.dirs
index c6373e42..2b531314 100644
--- a/debian/notmuch-vim.dirs
+++ b/debian/notmuch-vim.dirs
@@ -1,4 +1,4 @@
-usr/share/vim/registry
-usr/share/vim/addons/plugin
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 a1af708d..cf898738 100644
--- a/debian/notmuch-vim.install
+++ b/debian/notmuch-vim.install
@@ -1,4 +1,4 @@
-vim/notmuch.vim usr/share/vim/addons/plugin
vim/notmuch.txt usr/share/vim/addons/doc
-vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax
+vim/notmuch.vim usr/share/vim/addons/plugin
vim/notmuch.yaml usr/share/vim/registry
+vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax
diff --git a/debian/notmuch.install b/debian/notmuch.install
index 0cce21bd..b4847fe5 100644
--- a/debian/notmuch.install
+++ b/debian/notmuch.install
@@ -1,5 +1,5 @@
+emacs/notmuch-emacs-mua.desktop usr/share/applications
usr/bin/notmuch
usr/bin/notmuch-emacs-mua
usr/share/bash-completion
usr/share/zsh/vendor-completions
-emacs/notmuch-emacs-mua.desktop usr/share/applications
diff --git a/debian/notmuch.manpages b/debian/notmuch.manpages
index f9fcb54a..da91fc00 100644
--- a/debian/notmuch.manpages
+++ b/debian/notmuch.manpages
@@ -1,18 +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-address.1.gz
usr/share/man/man1/notmuch-compact.1.gz
+usr/share/man/man1/notmuch-config.1.gz
+usr/share/man/man1/notmuch-count.1.gz
+usr/share/man/man1/notmuch-dump.1.gz
usr/share/man/man1/notmuch-emacs-mua.1.gz
+usr/share/man/man1/notmuch-insert.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-search.1.gz
usr/share/man/man1/notmuch-show.1.gz
-usr/share/man/man1/notmuch-config.1.gz
+usr/share/man/man1/notmuch-tag.1.gz
+usr/share/man/man1/notmuch.1.gz
+usr/share/man/man5/notmuch-hooks.5.gz
usr/share/man/man7/notmuch-properties.7.gz
usr/share/man/man7/notmuch-search-terms.7.gz
--
2.24.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 5/6] debian/copyright: use secure git URL
2019-11-10 17:37 Debian packaging cleanup Daniel Kahn Gillmor
` (3 preceding siblings ...)
2019-11-10 17:37 ` [PATCH 4/6] wrap-and-sort -ast (for canonicalized debian metadata) Daniel Kahn Gillmor
@ 2019-11-10 17:37 ` Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 6/6] Add debian/upstream/metadata (for DEP-12) Daniel Kahn Gillmor
2019-11-12 15:47 ` Debian packaging cleanup Antoine Beaupré
6 siblings, 0 replies; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-10 17:37 UTC (permalink / raw)
To: Notmuch Mail
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/copyright | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/copyright b/debian/copyright
index 0931d9b9..a88ce1dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: notmuch
-Source: git://notmuchmail.org/git/notmuch
+Source: https://git.notmuchmail.org/git/notmuch
Upstream-Contact: Notmuch Mailing List <notmuch@notmuchmail.org>
Files: *
--
2.24.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 6/6] Add debian/upstream/metadata (for DEP-12)
2019-11-10 17:37 Debian packaging cleanup Daniel Kahn Gillmor
` (4 preceding siblings ...)
2019-11-10 17:37 ` [PATCH 5/6] debian/copyright: use secure git URL Daniel Kahn Gillmor
@ 2019-11-10 17:37 ` Daniel Kahn Gillmor
2019-11-12 15:47 ` Debian packaging cleanup Antoine Beaupré
6 siblings, 0 replies; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-10 17:37 UTC (permalink / raw)
To: Notmuch Mail
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/upstream/metadata | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 debian/upstream/metadata
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..8f266aa8
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,6 @@
+Bug-Database: https://nmbug.notmuchmail.org/status/
+Bug-Submit: mailto:notmuch@notmuchmail.org
+FAQ: https://notmuchmail.org/faq/
+Repository: https://git.notmuchmail.org/git/notmuch
+Repository-Browse: https://git.notmuchmail.org/git/notmuch
+Screenshots: https://notmuchmail.org/screenshots/
--
2.24.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: Debian packaging cleanup
2019-11-10 17:37 Debian packaging cleanup Daniel Kahn Gillmor
` (5 preceding siblings ...)
2019-11-10 17:37 ` [PATCH 6/6] Add debian/upstream/metadata (for DEP-12) Daniel Kahn Gillmor
@ 2019-11-12 15:47 ` Antoine Beaupré
2019-11-21 2:38 ` Daniel Kahn Gillmor
6 siblings, 1 reply; 17+ messages in thread
From: Antoine Beaupré @ 2019-11-12 15:47 UTC (permalink / raw)
To: notmuch
On 2019-11-10 12:37:42, Daniel Kahn Gillmor wrote:
> This series offers a set of simple and small changes to the debian
> packaging for notmuch. they apply to the master branch.
>
> I've reviewed these changes, and tested a build with them with no
> problems.
>
> A modern, canonicalized debian package is easier to work with.
>
> Please consider applying these changes! If you're uncomfortable with
> any of them, I'm happy to hear feedback.
Looks good to me.
--
The history of any one part of the earth, like the life of a soldier,
consists of long periods of boredom and short periods of terror.
- British geologist Derek V. Ager
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: Debian packaging cleanup
2019-11-12 15:47 ` Debian packaging cleanup Antoine Beaupré
@ 2019-11-21 2:38 ` Daniel Kahn Gillmor
2019-11-21 12:08 ` David Bremner
0 siblings, 1 reply; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-21 2:38 UTC (permalink / raw)
To: Antoine Beaupré, notmuch
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
On Tue 2019-11-12 10:47:33 -0500, Antoine Beaupré wrote:
> On 2019-11-10 12:37:42, Daniel Kahn Gillmor wrote:
>> This series offers a set of simple and small changes to the debian
>> packaging for notmuch. they apply to the master branch.
>
> Looks good to me.
Anarcat has reviewed these, but they're still tagged
notmuch::needs-review in nmbug. should i clear these tags now that
they've been reviewed by someone who knows something about debian
packaging?
--dkg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: Debian packaging cleanup
2019-11-21 2:38 ` Daniel Kahn Gillmor
@ 2019-11-21 12:08 ` David Bremner
2019-11-21 20:35 ` Daniel Kahn Gillmor
0 siblings, 1 reply; 17+ messages in thread
From: David Bremner @ 2019-11-21 12:08 UTC (permalink / raw)
To: Daniel Kahn Gillmor, Antoine Beaupré, notmuch
Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
> On Tue 2019-11-12 10:47:33 -0500, Antoine Beaupré wrote:
>> On 2019-11-10 12:37:42, Daniel Kahn Gillmor wrote:
>>> This series offers a set of simple and small changes to the debian
>>> packaging for notmuch. they apply to the master branch.
>>
>> Looks good to me.
>
> Anarcat has reviewed these, but they're still tagged
> notmuch::needs-review in nmbug. should i clear these tags now that
> they've been reviewed by someone who knows something about debian
> packaging?
>
Go for it.
d
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: Debian packaging cleanup
2019-11-21 12:08 ` David Bremner
@ 2019-11-21 20:35 ` Daniel Kahn Gillmor
0 siblings, 0 replies; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-11-21 20:35 UTC (permalink / raw)
To: David Bremner, Antoine Beaupré, notmuch
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
On Thu 2019-11-21 08:08:53 -0400, David Bremner wrote:
> Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
>> Anarcat has reviewed these, but they're still tagged
>> notmuch::needs-review in nmbug. should i clear these tags now that
>> they've been reviewed by someone who knows something about debian
>> packaging?
>
> Go for it.
done. :)
Thanks, Bremner and Anarcat.
--dkg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/6] Move to dh 12
2019-11-10 17:37 ` [PATCH 3/6] Move to dh 12 Daniel Kahn Gillmor
@ 2019-12-03 12:10 ` David Bremner
2019-12-03 20:50 ` Daniel Kahn Gillmor
0 siblings, 1 reply; 17+ messages in thread
From: David Bremner @ 2019-12-03 12:10 UTC (permalink / raw)
To: Daniel Kahn Gillmor, Notmuch Mail
Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
> Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
> ---
> debian/compat | 1 -
> debian/control | 2 +-
> 2 files changed, 1 insertion(+), 2 deletions(-)
> delete mode 100644 debian/compat
This change introduces a large number of warnings from dh_missing. I
guess this is because we install some things as upstream, and also in
debian specific ways. I'd rather not introduce 75 lines of warnings into
the build log at the moment. Do you want to rebase the series without
this patch, or some solution? We can add the files to
debian/not-installed, but that feels a bit ugly (and also technical
debt, since that file will get out of date)
d
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/6] Move to dh 12
2019-12-03 12:10 ` David Bremner
@ 2019-12-03 20:50 ` Daniel Kahn Gillmor
2019-12-03 23:17 ` David Bremner
0 siblings, 1 reply; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-12-03 20:50 UTC (permalink / raw)
To: David Bremner, Notmuch Mail
[-- Attachment #1: Type: text/plain, Size: 1337 bytes --]
On Tue 2019-12-03 08:10:44 -0400, David Bremner wrote:
> Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
>
>> Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
>> ---
>> debian/compat | 1 -
>> debian/control | 2 +-
>> 2 files changed, 1 insertion(+), 2 deletions(-)
>> delete mode 100644 debian/compat
>
> This change introduces a large number of warnings from dh_missing. I
> guess this is because we install some things as upstream, and also in
> debian specific ways. I'd rather not introduce 75 lines of warnings into
> the build log at the moment. Do you want to rebase the series without
> this patch, or some solution? We can add the files to
> debian/not-installed, but that feels a bit ugly (and also technical
> debt, since that file will get out of date)
I think what you're saying is that we *do* have the technical debt
already (in that we're not keeping track of what gets installed in a way
that dh knows about, vs. getting installed manually), and this patch
just exposes it :)
If you'd rather skip this for now and merge the rest of the series, i'm
happy to look into reducing the number of warnings later.
But in general, i'm not scared of introducing those warnings first --
hopefully having the warnings present will encourage someone™ to fix
them!
--dkg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/6] Move to dh 12
2019-12-03 20:50 ` Daniel Kahn Gillmor
@ 2019-12-03 23:17 ` David Bremner
2019-12-04 7:11 ` Daniel Kahn Gillmor
0 siblings, 1 reply; 17+ messages in thread
From: David Bremner @ 2019-12-03 23:17 UTC (permalink / raw)
To: Daniel Kahn Gillmor, Notmuch Mail
Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
> On Tue 2019-12-03 08:10:44 -0400, David Bremner wrote:
>> Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
>>
>>> Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
>>> ---
>>> debian/compat | 1 -
>>> debian/control | 2 +-
>>> 2 files changed, 1 insertion(+), 2 deletions(-)
>>> delete mode 100644 debian/compat
>>
>> This change introduces a large number of warnings from dh_missing. I
>> guess this is because we install some things as upstream, and also in
>> debian specific ways. I'd rather not introduce 75 lines of warnings into
>> the build log at the moment. Do you want to rebase the series without
>> this patch, or some solution? We can add the files to
>> debian/not-installed, but that feels a bit ugly (and also technical
>> debt, since that file will get out of date)
>
> I think what you're saying is that we *do* have the technical debt
> already (in that we're not keeping track of what gets installed in a way
> that dh knows about, vs. getting installed manually), and this patch
> just exposes it :)
>
> If you'd rather skip this for now and merge the rest of the series, i'm
> happy to look into reducing the number of warnings later.
>
I've merged all except this patch, and the wrap-and-sort. No real
objection to the latter, but it is too painful to rebase, and will need
regeneration.
d
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/6 v2] wrap-and-sort -ast
2019-11-10 17:37 ` [PATCH 4/6] wrap-and-sort -ast (for canonicalized debian metadata) Daniel Kahn Gillmor
@ 2019-12-04 7:07 ` Daniel Kahn Gillmor
2019-12-04 12:09 ` David Bremner
0 siblings, 1 reply; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-12-04 7:07 UTC (permalink / raw)
To: Notmuch Mail
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/control | 105 ++++++++++++++++++++++++------------
debian/notmuch-mutt.install | 2 +-
debian/notmuch-vim.dirs | 4 +-
debian/notmuch-vim.install | 4 +-
debian/notmuch.install | 2 +-
debian/notmuch.manpages | 18 +++----
6 files changed, 85 insertions(+), 50 deletions(-)
diff --git a/debian/control b/debian/control
index 9e5533d1..1c9427b2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,35 +4,37 @@ Priority: optional
Maintainer: Carl Worth <cworth@debian.org>
Uploaders:
Jameson Graef Rollins <jrollins@finestructure.net>,
- David Bremner <bremner@debian.org>
-Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]
+ David Bremner <bremner@debian.org>,
+Build-Conflicts:
+ gdb [ia64 mips mips64el],
+ gdb-minimal,
+ ruby1.8,
Build-Depends:
- dpkg-dev (>= 1.17.14),
+ bash-completion (>=1.9.0~),
debhelper (>= 11~),
- pkg-config,
- libxapian-dev,
+ dh-elpa (>= 1.3),
+ dh-python,
+ dpkg-dev (>= 1.17.14),
+ dtach (>= 0.8) <!nocheck>,
+ emacs-nox | emacs-gtk | emacs-lucid | emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) | emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
+ gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
+ gnupg <!nocheck>,
+ gpgsm <!nocheck>,
libgmime-3.0-dev (>= 3.0.3~),
+ libpython3-all-dev,
libtalloc-dev,
+ libxapian-dev,
libz-dev,
+ pkg-config,
python3-all (>= 3.1.2-7~),
- dh-python,
- dh-elpa (>= 1.3),
python3-cffi,
python3-pytest,
python3-pytest-cov,
python3-setuptools,
python3-sphinx,
- libpython3-all-dev,
- ruby, ruby-dev (>>1:1.9.3~),
- emacs-nox | emacs-gtk | emacs-lucid |
- emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
- emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
- gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
- dtach (>= 0.8) <!nocheck>,
- gpgsm <!nocheck>,
- gnupg <!nocheck>,
- bash-completion (>=1.9.0~),
- texinfo
+ ruby,
+ ruby-dev (>>1:1.9.3~),
+ texinfo,
Standards-Version: 4.4.1
Homepage: https://notmuchmail.org/
Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
@@ -41,8 +43,14 @@ Rules-Requires-Root: no
Package: notmuch
Architecture: any
-Depends: libnotmuch5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: elpa-notmuch | notmuch-vim | notmuch-mutt | alot, gnupg-agent, gpgsm
+Depends:
+ libnotmuch5 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ elpa-notmuch | notmuch-vim | notmuch-mutt | alot,
+ gnupg-agent,
+ gpgsm,
Description: thread-based email index, search and tagging
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -54,8 +62,11 @@ Description: thread-based email index, search and tagging
Package: libnotmuch5
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Pre-Depends:
+ ${misc:Pre-Depends},
Description: thread-based email index, search and tagging (runtime)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -68,7 +79,9 @@ Description: thread-based email index, search and tagging (runtime)
Package: libnotmuch-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libnotmuch5 (= ${binary:Version})
+Depends:
+ libnotmuch5 (= ${binary:Version}),
+ ${misc:Depends},
Description: thread-based email index, search and tagging (development)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -81,7 +94,10 @@ Description: thread-based email index, search and tagging (development)
Package: python3-notmuch
Architecture: all
Section: python
-Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch5 (>= ${source:Version})
+Depends:
+ libnotmuch5 (>= ${source:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
Description: Python 3 interface to the notmuch mail search and index library
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -94,7 +110,9 @@ Description: Python 3 interface to the notmuch mail search and index library
Package: ruby-notmuch
Architecture: any
Section: ruby
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Ruby interface to the notmuch mail search and index library
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -107,13 +125,17 @@ Description: Ruby interface to the notmuch mail search and index library
Package: notmuch-emacs
Section: oldlibs
Architecture: all
-Depends: elpa-notmuch, ${misc:Depends}
+Depends:
+ elpa-notmuch,
+ ${misc:Depends},
Description: thread-based email index, search and tagging (transitional package)
This dummy package help ease transition to the new package elpa-notmuch
Package: elpa-notmuch
Architecture: all
-Depends: ${misc:Depends}, ${elpa:Depends}
+Depends:
+ ${elpa:Depends},
+ ${misc:Depends},
Description: thread-based email index, search and tagging (emacs interface)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -125,10 +147,18 @@ Description: thread-based email index, search and tagging (emacs interface)
Package: notmuch-vim
Architecture: all
-Breaks: notmuch (<<0.6~254~)
-Replaces: notmuch (<<0.6~254~)
-Depends: ${misc:Depends}, notmuch, vim-addon-manager, vim-ruby, ruby-notmuch
-Recommends: ruby-mail
+Breaks:
+ notmuch (<<0.6~254~),
+Replaces:
+ notmuch (<<0.6~254~),
+Depends:
+ notmuch,
+ ruby-notmuch,
+ vim-addon-manager,
+ vim-ruby,
+ ${misc:Depends},
+Recommends:
+ ruby-mail,
Description: thread-based email index, search and tagging (vim interface)
Notmuch is a system for indexing, searching, reading, and tagging
large collections of email messages in maildir or mh format. It uses
@@ -141,13 +171,18 @@ Description: thread-based email index, search and tagging (vim interface)
Package: notmuch-mutt
Architecture: all
Depends:
+ libmail-box-perl,
+ libmailtools-perl,
+ libstring-shellquote-perl,
+ libterm-readline-gnu-perl,
notmuch (>= 0.4),
- libmail-box-perl, libmailtools-perl,
- libstring-shellquote-perl, libterm-readline-gnu-perl,
${misc:Depends},
${perl:Depends},
-Recommends: mutt
-Enhances: notmuch, mutt
+Recommends:
+ mutt,
+Enhances:
+ mutt,
+ notmuch,
Description: thread-based email index, search and tagging (Mutt interface)
notmuch-mutt provides integration among the Mutt mail user agent and
the Notmuch mail indexer.
diff --git a/debian/notmuch-mutt.install b/debian/notmuch-mutt.install
index 9b468bdb..8314f883 100644
--- a/debian/notmuch-mutt.install
+++ b/debian/notmuch-mutt.install
@@ -1,2 +1,2 @@
-usr/bin/notmuch-mutt
etc/Muttrc.d/notmuch-mutt.rc
+usr/bin/notmuch-mutt
diff --git a/debian/notmuch-vim.dirs b/debian/notmuch-vim.dirs
index c6373e42..2b531314 100644
--- a/debian/notmuch-vim.dirs
+++ b/debian/notmuch-vim.dirs
@@ -1,4 +1,4 @@
-usr/share/vim/registry
-usr/share/vim/addons/plugin
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 a1af708d..cf898738 100644
--- a/debian/notmuch-vim.install
+++ b/debian/notmuch-vim.install
@@ -1,4 +1,4 @@
-vim/notmuch.vim usr/share/vim/addons/plugin
vim/notmuch.txt usr/share/vim/addons/doc
-vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax
+vim/notmuch.vim usr/share/vim/addons/plugin
vim/notmuch.yaml usr/share/vim/registry
+vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax
diff --git a/debian/notmuch.install b/debian/notmuch.install
index 0cce21bd..b4847fe5 100644
--- a/debian/notmuch.install
+++ b/debian/notmuch.install
@@ -1,5 +1,5 @@
+emacs/notmuch-emacs-mua.desktop usr/share/applications
usr/bin/notmuch
usr/bin/notmuch-emacs-mua
usr/share/bash-completion
usr/share/zsh/vendor-completions
-emacs/notmuch-emacs-mua.desktop usr/share/applications
diff --git a/debian/notmuch.manpages b/debian/notmuch.manpages
index f9fcb54a..da91fc00 100644
--- a/debian/notmuch.manpages
+++ b/debian/notmuch.manpages
@@ -1,18 +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-address.1.gz
usr/share/man/man1/notmuch-compact.1.gz
+usr/share/man/man1/notmuch-config.1.gz
+usr/share/man/man1/notmuch-count.1.gz
+usr/share/man/man1/notmuch-dump.1.gz
usr/share/man/man1/notmuch-emacs-mua.1.gz
+usr/share/man/man1/notmuch-insert.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-search.1.gz
usr/share/man/man1/notmuch-show.1.gz
-usr/share/man/man1/notmuch-config.1.gz
+usr/share/man/man1/notmuch-tag.1.gz
+usr/share/man/man1/notmuch.1.gz
+usr/share/man/man5/notmuch-hooks.5.gz
usr/share/man/man7/notmuch-properties.7.gz
usr/share/man/man7/notmuch-search-terms.7.gz
--
2.24.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 3/6] Move to dh 12
2019-12-03 23:17 ` David Bremner
@ 2019-12-04 7:11 ` Daniel Kahn Gillmor
0 siblings, 0 replies; 17+ messages in thread
From: Daniel Kahn Gillmor @ 2019-12-04 7:11 UTC (permalink / raw)
To: David Bremner, Notmuch Mail
[-- Attachment #1: Type: text/plain, Size: 429 bytes --]
On Tue 2019-12-03 19:17:19 -0400, David Bremner wrote:
> I've merged all except this patch,
Thanks!
> and the wrap-and-sort. No real objection to the latter, but it is too
> painful to rebase, and will need regeneration.
I've regenerated it and sent it to the list. the earlier you apply
wrap-and-sort -ast, the nicer it is for future diffs :)
I'll take a look at the dh12 migration and dh_missing soon.
-dkg
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 4/6 v2] wrap-and-sort -ast
2019-12-04 7:07 ` [PATCH 4/6 v2] wrap-and-sort -ast Daniel Kahn Gillmor
@ 2019-12-04 12:09 ` David Bremner
0 siblings, 0 replies; 17+ messages in thread
From: David Bremner @ 2019-12-04 12:09 UTC (permalink / raw)
To: Daniel Kahn Gillmor, Notmuch Mail
Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
> Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
> ---
> debian/control | 105 ++++++++++++++++++++++++------------
> debian/notmuch-mutt.install | 2 +-
> debian/notmuch-vim.dirs | 4 +-
> debian/notmuch-vim.install | 4 +-
> debian/notmuch.install | 2 +-
> debian/notmuch.manpages | 18 +++----
> 6 files changed, 85 insertions(+), 50 deletions(-)
merged.
d
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2019-12-04 12:09 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-10 17:37 Debian packaging cleanup Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 1/6] Standards-Version: bump to 4.4.1 (no changes needed) Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 2/6] Rules-Requires-Root: no (we do nothing as root during package build) Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 3/6] Move to dh 12 Daniel Kahn Gillmor
2019-12-03 12:10 ` David Bremner
2019-12-03 20:50 ` Daniel Kahn Gillmor
2019-12-03 23:17 ` David Bremner
2019-12-04 7:11 ` Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 4/6] wrap-and-sort -ast (for canonicalized debian metadata) Daniel Kahn Gillmor
2019-12-04 7:07 ` [PATCH 4/6 v2] wrap-and-sort -ast Daniel Kahn Gillmor
2019-12-04 12:09 ` David Bremner
2019-11-10 17:37 ` [PATCH 5/6] debian/copyright: use secure git URL Daniel Kahn Gillmor
2019-11-10 17:37 ` [PATCH 6/6] Add debian/upstream/metadata (for DEP-12) Daniel Kahn Gillmor
2019-11-12 15:47 ` Debian packaging cleanup Antoine Beaupré
2019-11-21 2:38 ` Daniel Kahn Gillmor
2019-11-21 12:08 ` David Bremner
2019-11-21 20:35 ` Daniel Kahn Gillmor
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).