From 59c99fdc79bb31fb42cb99d4b95613022396a499 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Sun, 10 Dec 2023 19:00:53 +0200 Subject: [PATCH] debian: update debian package metadata Signed-off-by: Manos Pitsidianakis --- Makefile | 3 ++- debian/compat | 1 - debian/control | 14 ++++++++++---- debian/copyright | 2 +- debian/extra/meli.desktop | 8 ++++++++ debian/meli.bug-presubj | 7 +++++++ debian/meli.bug-script | 9 +++++++++ debian/meli.doc-base | 5 +++++ debian/meli.examples | 2 ++ debian/patches/series | 1 + debian/patches/usr_bin_editor.patch | 23 +++++++++++++++++++++++ debian/rules | 3 ++- 12 files changed, 70 insertions(+), 8 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/extra/meli.desktop create mode 100644 debian/meli.bug-presubj create mode 100755 debian/meli.bug-script create mode 100644 debian/meli.doc-base create mode 100644 debian/meli.examples create mode 100644 debian/patches/usr_bin_editor.patch diff --git a/Makefile b/Makefile index 4a8ed7bc..5d22c1e1 100644 --- a/Makefile +++ b/Makefile @@ -130,8 +130,9 @@ clean: -rm -rf ./${CARGO_TARGET_DIR}/ .PHONY: distclean -distclean: clean +distclean: @rm -f meli-${VERSION}.tar.gz + @rm -rf .pc # rm debian stuff .PHONY: uninstall uninstall: 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 70e8867e..1d76d42a 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,19 @@ Source: meli Section: mail Priority: optional Maintainer: Manos Pitsidianakis -Build-Depends: debhelper (>=11~), mandoc (>=1.14.4-1), quilt, libsqlite3-dev +Build-Depends: debhelper-compat (=13), mandoc (>=1.14.4-1), quilt, libsqlite3-dev Standards-Version: 4.1.4 +Rules-Requires-Root: no +Vcs-Git: https://git.meliemail.org/meli/meli.git +Vcs-Browser: https://git.meliemail.org/meli/meli Homepage: https://meliemail.org Package: meli Architecture: any -Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: libnotmuch, xdg-utils (>=1.1.3-1) -Description: terminal mail client +Recommends: xdg-utils (>=1.1.3-1), w3m, mailcap +Suggests: libnotmuch5, notmuch, rss2email, xterm, neovim, msmtp +Provides: mail-reader, imap-client +Description: terminal mail client. + meli supports mbox, maildir, IMAP, JMAP, notmuch and NNTP (Usernet) with + TLS/SSL, SASL, GPG features. diff --git a/debian/copyright b/debian/copyright index 89697eb3..345434c5 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: meli -Source: +Source: https://git.meliemail.org/meli/meli # # Please double check copyright with the licensecheck(1) command. diff --git a/debian/extra/meli.desktop b/debian/extra/meli.desktop new file mode 100644 index 00000000..58e255ba --- /dev/null +++ b/debian/extra/meli.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=meli +Exec=meli +Categories=Office;Network;Email; +Comment=Terminal mail client +NoDisplay=false +Terminal=true +Type=Application diff --git a/debian/meli.bug-presubj b/debian/meli.bug-presubj new file mode 100644 index 00000000..93472ead --- /dev/null +++ b/debian/meli.bug-presubj @@ -0,0 +1,7 @@ +WARNING: This package is not distributed by debian, it was generated from the source repository of meli. + +Please do not report bugs to debian, but to the appropriate issue tracker for meli: + +- https://git.meliemail.org/meli/meli/issues +- Send e-mail to the mailing list, "meli general" + https://lists.meliemail.org/list/meli-general/ diff --git a/debian/meli.bug-script b/debian/meli.bug-script new file mode 100755 index 00000000..61eb1c98 --- /dev/null +++ b/debian/meli.bug-script @@ -0,0 +1,9 @@ +#!/bin/sh + +echo "Including output of \`meli -v\` and \`meli compiled-with\`..." + +LC_ALL=C meli -v >&3 + +echo "\nEnabled compile-time features" +echo "-----------------------------" +LC_ALL=C meli compiled-with >&3 || true diff --git a/debian/meli.doc-base b/debian/meli.doc-base new file mode 100644 index 00000000..f3cf8a4e --- /dev/null +++ b/debian/meli.doc-base @@ -0,0 +1,5 @@ +Document: meli +Title: meli E-mail Client Manual +Author: Various +Abstract: Manual for meli the terminal e-mail client. +Section: Network/Communication diff --git a/debian/meli.examples b/debian/meli.examples new file mode 100644 index 00000000..bf06806e --- /dev/null +++ b/debian/meli.examples @@ -0,0 +1,2 @@ +meli/docs/samples/sample-config.toml +meli/docs/samples/themes diff --git a/debian/patches/series b/debian/patches/series index 8c73ddcc..5c5d6d40 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-prefix-for-debian.patch +usr_bin_editor.patch diff --git a/debian/patches/usr_bin_editor.patch b/debian/patches/usr_bin_editor.patch new file mode 100644 index 00000000..620fad7e --- /dev/null +++ b/debian/patches/usr_bin_editor.patch @@ -0,0 +1,23 @@ +From: Manos Pitsidianakis +Date: Thu, 27 Feb 2014 16:06:15 +0100 +Subject: usr_bin_editor + +If EDITOR or VISUAL is not set, fall back to /usr/bin/editor, +which is set by update-alternatives. +--- + meli/src/subcommands.rs | 1 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- a/meli/src/subcommands.rs ++++ b/meli/src/subcommands.rs +@@ -52,9 +52,7 @@ + pub fn edit_config() -> Result<()> { + let editor = std::env::var("EDITOR") + .or_else(|_| std::env::var("VISUAL")) +- .map_err(|err| { +- format!("Could not find any value in environment variables EDITOR and VISUAL. {err}") +- })?; ++ .unwrap_or_else(|_| "/usr/bin/editor".into()); + let config_path = crate::conf::get_config_file()?; + + let mut cmd = Command::new(editor); diff --git a/debian/rules b/debian/rules index 748bb715..4184211b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f # You must remove unused comment lines for the released package. -#export DH_VERBOSE = 1 +export RUSTUP_HOME=${HOME}/.rustup +export DH_VERBOSE = 1 #export DEB_BUILD_MAINT_OPTIONS = hardening=+all #export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed