[PATCH 4/6] wrap-and-sort -ast (for canonicalized debian metadata)
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Sun Nov 10 09:37:46 PST 2019
Signed-off-by: Daniel Kahn Gillmor <dkg at 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 at debian.org>
Uploaders:
Jameson Graef Rollins <jrollins at finestructure.net>,
- David Bremner <bremner at debian.org>
-Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]
+ David Bremner <bremner at 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
More information about the notmuch
mailing list