This is an automated email from the git hooks/post-receive script. czchen pushed a commit to branch master in repository shutter.
commit 3bff26a542387116c3d2e09b97fcc8d4e0ac14f2 Author: Boyuan Yang <073p...@gmail.com> Date: Tue Dec 6 17:54:50 2016 +0800 d/patches: 0003: add patch to error on calling xdg-email. Signed-off-by: Boyuan Yang <073p...@gmail.com> --- debian/changelog | 5 ++-- ...-utf8-for-retrieved-window-name-from-Gtk2.patch | 7 +++--- .../0003-Fix-error-on-executing-xdg-email.patch | 28 ++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 53abd8a..1e60bb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,10 @@ shutter (0.93.1-1.1) unstable; urgency=medium * Non-maintainer upload. * Add patch to fix messy display for non-latin characters. (Closes: #847051, LP: #1556021, LP: #1618310) - * Add patch to fix crash on sending email. (Closes: #819149) + * Add patch to fix crash on sending email. + (Closes: #819149, LP: #1469840) - -- Boyuan Yang <073p...@gmail.com> Tue, 06 Dec 2016 17:21:36 +0800 + -- Boyuan Yang <073p...@gmail.com> Tue, 06 Dec 2016 17:53:43 +0800 shutter (0.93.1-1) unstable; urgency=medium diff --git a/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch b/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch index 6ed2e95..ff90048 100644 --- a/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch +++ b/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch @@ -1,14 +1,13 @@ From: Boyuan Yang <073p...@gmail.com> Date: Mon, 5 Dec 2016 16:21:51 +0800 Subject: Force utf8 for retrieved window name from Gtk2. +Bug-Debian: https://bugs.debian.org/847051 +Bug: https://bugs.launchpad.net/ubuntu/+source/shutter/+bug/1556021 +Last-Update: 2016-12-05 Transform the window name retrieved from Gtk2 to utf8 to prevent messy encoding problem. Otherwise latin-1 would be used and cause mess. - -This should work on most contemporary systems. - -Signed-off-by: Boyuan Yang <073p...@gmail.com> --- bin/shutter | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/patches/0003-Fix-error-on-executing-xdg-email.patch b/debian/patches/0003-Fix-error-on-executing-xdg-email.patch new file mode 100644 index 0000000..46a2e8d --- /dev/null +++ b/debian/patches/0003-Fix-error-on-executing-xdg-email.patch @@ -0,0 +1,28 @@ +From: Robin Lee <robinlee.s...@gmail.com> +Date: Tue, 6 Dec 2016 17:26:45 +0800 +Subject: Fix error on executing xdg-email. +Origin: https://bugs.launchpad.net/shutter/+bug/1469840 +Bug: https://bugs.launchpad.net/shutter/+bug/1469840 +Bug-Debian: https://bugs.debian.org/819149 +Acked-by: Boyuan Yang <073p...@gmail.com> + +This error occurs because shutter passed +"--attach file:///path/to/image" to xdg-email, +but --attach expects a file path, not a URI. +--- + bin/shutter | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/shutter b/bin/shutter +index 38eeedd..791057a 100755 +--- a/bin/shutter ++++ b/bin/shutter +@@ -6967,7 +6967,7 @@ else { + ); + } + else { +- push( @files_to_email, $session_screens{$key}->{'uri'}->to_string ); ++ push( @files_to_email, $session_screens{$key}->{'long'} ); + } + + my $mail_string = undef; diff --git a/debian/patches/series b/debian/patches/series index f01ee2f..b7042f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ insecure_use_of_system.patch 0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch +0003-Fix-error-on-executing-xdg-email.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/shutter.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits