From 4da7aa91129ad055b39572ba7bc743a0f5b0f5bc Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Thu, 10 Sep 2009 23:20:27 +0100 Subject: [PATCH] debian/extra/lib/mailto-mutt: patch from madduck@ to correctly handle the way mutt is parsing the command line now (Closes: 545876) --- debian/changelog | 2 ++ debian/extra/lib/mailto-mutt | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2256af1..7b1ba7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ mutt (1.5.20-3) UNRELEASED; urgency=low connection, as it was before 1.5.20 (Closes: 535096) * debian/control: + Standards-Version bumped to 3.8.3 + * debian/extra/lib/mailto-mutt: patch from madduck@ to correctly handle the + way mutt is parsing the command line now (Closes: 545876) -- Antonio Radici Sat, 15 Aug 2009 00:32:49 +0100 diff --git a/debian/extra/lib/mailto-mutt b/debian/extra/lib/mailto-mutt index 82f3067..730c021 100755 --- a/debian/extra/lib/mailto-mutt +++ b/debian/extra/lib/mailto-mutt @@ -92,12 +92,13 @@ fi mutt_args="${mutt_args:+$mutt_args }$(get_addr_args -c $cc)" mutt_args="${mutt_args:+$mutt_args }$(get_addr_args -b $bcc)" -mutt_args="${mutt_args:+$mutt_args }$(get_addr_args $MAILTO)" +mutt_args="${mutt_args:+$mutt_args }-- $(get_addr_args $MAILTO)" run() { if [ ${debug:-0} -eq 1 ]; then echo "$@" + [ -t 0 ] && [ -t 1 ] && [ -t 2 ] && $SHELL else eval "$@" fi @@ -105,12 +106,12 @@ run() if [ -n "$body" ]; then TMPFILE="$(tempfile -p mailto -d /tmp)" + trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15 echo "$body" > $TMPFILE - trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - run x-terminal-emulator -e mutt${mutt_args:+ $mutt_args} -i $TMPFILE + run x-terminal-emulator -e mutt -i $TMPFILE${mutt_args:+ $mutt_args} ret=$? rm -f $TMPFILE - trap - 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + trap - 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15 exit $ret else run exec x-terminal-emulator -e mutt${mutt_args:+ $mutt_args} -- 2.43.0