Control: tag -1 + patch Control: tag -1 + pending Dear maintainer,
I've prepared an NMU for shutter (versioned as 0.93.1-1.1) and uploaded it to DELAYED/10. Please fell free to tell me if I should delay it longer. Regards, Boyuan Yang
diff -Nru shutter-0.93.1/debian/changelog shutter-0.93.1/debian/changelog --- shutter-0.93.1/debian/changelog 2015-11-06 10:48:26.000000000 +0800 +++ shutter-0.93.1/debian/changelog 2016-12-06 21:53:19.000000000 +0800 @@ -1,3 +1,16 @@ +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, LP: #1469840) + * Add libgtk2-appindicator-perl into Recommends list. + This helps utilize libappindicator and provide with better + user experience for tray icon. + + -- Boyuan Yang <[email protected]> Tue, 06 Dec 2016 21:53:19 +0800 + shutter (0.93.1-1) unstable; urgency=medium * Non-maintainer upload. diff -Nru shutter-0.93.1/debian/control shutter-0.93.1/debian/control --- shutter-0.93.1/debian/control 2015-11-06 10:48:26.000000000 +0800 +++ shutter-0.93.1/debian/control 2016-12-06 21:53:19.000000000 +0800 @@ -11,7 +11,7 @@ Package: shutter Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2-perl, libglib-perl, libgnome2-perl, libgnome2-vfs-perl, libgnome2-wnck-perl, libgnome2-gconf-perl, liblocale-gettext-perl, libxml-simple-perl, libwww-mechanize-perl, libwww-perl, perlmagick, libx11-protocol-perl, librsvg2-common, libfile-basedir-perl, libfile-copy-recursive-perl, libproc-simple-perl, libfile-which-perl, libsort-naturally-perl, libgtk2-imageview-perl, libnet-dbus-perl, libgnome2-canvas-perl, imagemagick, libgtk2-unique-perl, libproc-processtable-perl, procps, xdg-utils, libpath-class-perl, libjson-perl, libjson-xs-perl, libnet-dropbox-api-perl -Recommends: libgoo-canvas-perl +Recommends: libgoo-canvas-perl, libgtk2-appindicator-perl Suggests: gnome-web-photo, nautilus-sendto, libimage-exiftool-perl, libnet-dbus-glib-perl Description: feature-rich screenshot program Shutter is a feature-rich screenshot program. You can take a diff -Nru shutter-0.93.1/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch shutter-0.93.1/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch --- shutter-0.93.1/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch 1970-01-01 07:30:00.000000000 +0730 +++ shutter-0.93.1/debian/patches/0002-Force-utf8-for-retrieved-window-name-from-Gtk2.patch 2016-12-06 21:53:19.000000000 +0800 @@ -0,0 +1,39 @@ +From: Boyuan Yang <[email protected]> +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. +--- + bin/shutter | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/bin/shutter b/bin/shutter +index a0495d4..38eeedd 100755 +--- a/bin/shutter ++++ b/bin/shutter +@@ -30,6 +30,9 @@ use utf8; + use strict; + use warnings; + ++#Deal with encoding problem ++use Encode; ++ + #Gnome2 libraries + use Gnome2; + use Gnome2::Wnck; +@@ -8624,7 +8627,9 @@ else { + #add all windows to menu to capture it directly + foreach my $win ( $wnck_screen->get_windows_stacked ) { + if ( $active_workspace && $win->is_on_workspace($active_workspace) ) { +- my $window_item = Gtk2::ImageMenuItem->new_with_label( $win->get_name ); ++ my $win_name = $win->get_name; ++ Encode::_utf8_on( $win_name ); ++ my $window_item = Gtk2::ImageMenuItem->new_with_label( $win_name ); + foreach my $child ( $window_item->get_children ) { + if ( $child =~ /Gtk2::AccelLabel/ ) { + $child->set_width_chars(50); diff -Nru shutter-0.93.1/debian/patches/0003-Fix-error-on-executing-xdg-email.patch shutter-0.93.1/debian/patches/0003-Fix-error-on-executing-xdg-email.patch --- shutter-0.93.1/debian/patches/0003-Fix-error-on-executing-xdg-email.patch 1970-01-01 07:30:00.000000000 +0730 +++ shutter-0.93.1/debian/patches/0003-Fix-error-on-executing-xdg-email.patch 2016-12-06 21:53:19.000000000 +0800 @@ -0,0 +1,28 @@ +From: Robin Lee <[email protected]> +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 <[email protected]> + +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 -Nru shutter-0.93.1/debian/patches/insecure_use_of_system.patch shutter-0.93.1/debian/patches/insecure_use_of_system.patch --- shutter-0.93.1/debian/patches/insecure_use_of_system.patch 2015-11-06 10:48:26.000000000 +0800 +++ shutter-0.93.1/debian/patches/insecure_use_of_system.patch 2016-12-06 21:53:19.000000000 +0800 @@ -1,13 +1,18 @@ -Description: Fix insecure use of system() -Author: Luke Faraone <[email protected]> +From: Loke Faraone <[email protected]> +Date: Thu, 5 Nov 2015 21:35:37 -0500 +Subject: Fix insecure use of system() Bug: https://bugs.launchpad.net/shutter/+bug/1495163 -Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798862 +Debian-Bug: https://bugs.debian.org/798862 -Index: shutter/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm -=================================================================== ---- shutter.orig/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm 2015-11-05 21:34:34.222313258 -0500 -+++ shutter/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm 2015-11-05 21:35:37.299461116 -0500 -@@ -53,7 +53,8 @@ +--- + share/shutter/resources/modules/Shutter/App/HelperFunctions.pm | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm b/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm +index 0de1a6c..ffd0de1 100644 +--- a/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm ++++ b/share/shutter/resources/modules/Shutter/App/HelperFunctions.pm +@@ -53,7 +53,8 @@ sub new { sub xdg_open { my ( $self, $dialog, $link, $user_data ) = @_; diff -Nru shutter-0.93.1/debian/patches/series shutter-0.93.1/debian/patches/series --- shutter-0.93.1/debian/patches/series 2015-11-06 10:48:26.000000000 +0800 +++ shutter-0.93.1/debian/patches/series 2016-12-06 21:53:19.000000000 +0800 @@ -1 +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
signature.asc
Description: This is a digitally signed message part.
