diff -u checkgmail-1.13+svn43/debian/changelog checkgmail-1.13+svn43/debian/changelog --- checkgmail-1.13+svn43/debian/changelog +++ checkgmail-1.13+svn43/debian/changelog @@ -1,3 +1,30 @@ +checkgmail (1.13+svn43-2fakesync1) maverick; urgency=low + + * fakesync from debian unstable due to tarball mismatch LP: #591333 + + -- Bhavani Shankar Tue, 08 Jun 2010 21:43:59 +0530 + +checkgmail (1.13+svn43-2) unstable; urgency=low + + * 40_bts568882_use_GTK_new_widget_insteadof_libsexy.dpatch + - remove objects from libsexy and uses the GTK+ widgets that now integrate + libsexy ones; thanks to Julian Andres Klode for the report and patch; + Closes: #568882 + * debian/control + - drop Depends on libgtk2-sexy-perl, not needed anymore + - drop Recommends on libsexymm2, not needed anymore + - bump versioned Depends on libgtk2.0-0 to (>= 2.18.0), needed to drop + libsexy + - bump Standards-Version to 3.8.4 (no changes needed) + - added ${misc:Depends} to Depends + * debian/patches/50_bts568890_use_xdg-open.dpatch + - use xdg-open from FreeDesktop.org tools instead of firefox; thanks to + Julian Andres Klode for the report; Closes: #568890 + * debian/copyright + - extended copyright years + + -- Sandro Tosi Sat, 20 Mar 2010 00:10:32 +0100 + checkgmail (1.13+svn43-1ubuntu1) lucid; urgency=low * Fakesync from debian testing (LP: #487876). Keep ubuntu version due to diff -u checkgmail-1.13+svn43/debian/copyright checkgmail-1.13+svn43/debian/copyright --- checkgmail-1.13+svn43/debian/copyright +++ checkgmail-1.13+svn43/debian/copyright @@ -27,3 +27,3 @@ -The Debian packaging is Copyright (C) 2006-2009, Sandro Tosi +The Debian packaging is Copyright (C) 2006-2010, Sandro Tosi and is licensed under the same terms as of upstream code. diff -u checkgmail-1.13+svn43/debian/control checkgmail-1.13+svn43/debian/control --- checkgmail-1.13+svn43/debian/control +++ checkgmail-1.13+svn43/debian/control @@ -4,13 +4,13 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Sandro Tosi Build-Depends: debhelper (>= 5.0.51~), dpatch -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://checkgmail.sourceforge.net/ Package: checkgmail Architecture: all -Depends: perl (>= 5.8), libgtk2-perl, libgtk2-trayicon-perl, libwww-perl, libcrypt-ssleay-perl, libxml-simple-perl, libcrypt-blowfish-perl, libfreezethaw-perl, libcompress-zlib-perl, libgtk2.0-0 (>= 2.6.0), libgtk2-sexy-perl -Recommends: libcrypt-simple-perl, libsexymm2 +Depends: ${misc:Depends}, perl (>= 5.8), libgtk2-perl, libgtk2-trayicon-perl, libwww-perl, libcrypt-ssleay-perl, libxml-simple-perl, libcrypt-blowfish-perl, libfreezethaw-perl, libcompress-zlib-perl, libgtk2.0-0 (>= 2.18.0) +Recommends: libcrypt-simple-perl Description: alternative Gmail Notifier for Linux via Atom feeds CheckGmail is an alternative Gmail Notifier for Linux and other *nix systems. It is fast, secure and uses minimal bandwidth via the use of diff -u checkgmail-1.13+svn43/debian/patches/00list checkgmail-1.13+svn43/debian/patches/00list --- checkgmail-1.13+svn43/debian/patches/00list +++ checkgmail-1.13+svn43/debian/patches/00list @@ -3,0 +4,2 @@ +40_bts568882_use_GTK_new_widget_insteadof_libsexy +50_bts568890_use_xdg-open only in patch2: unchanged: --- checkgmail-1.13+svn43.orig/debian/patches/50_bts568890_use_xdg-open.dpatch +++ checkgmail-1.13+svn43/debian/patches/50_bts568890_use_xdg-open.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_bts568890_use_xdg-open.dpatch by Sandro Tosi +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use xdg-open from FreeDesktop tools instead of firefox + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' checkgmail~/checkgmail checkgmail/checkgmail +--- checkgmail~/checkgmail 2010-03-19 23:21:58.706648684 +0100 ++++ checkgmail/checkgmail 2010-03-19 23:22:27.479150390 +0100 +@@ -412,7 +412,7 @@ + $save_passwd = 0; + $time_24 = 0; + $archive_as_read = 0; +-$gmail_command = 'firefox %u'; ++$gmail_command = 'xdg-open %u'; + $language = 'English'; + + # Global variables only in patch2: unchanged: --- checkgmail-1.13+svn43.orig/debian/patches/40_bts568882_use_GTK_new_widget_insteadof_libsexy.dpatch +++ checkgmail-1.13+svn43/debian/patches/40_bts568882_use_GTK_new_widget_insteadof_libsexy.dpatch @@ -0,0 +1,89 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_bts568882_use_GTK_new_widget_instreadof_libsexy.dpatch by Julian Andres Klode +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace Gtk2::Sexy::UrlLabel with Gtk2::Label. +## DP: GTK+ 2.18 supports showing links inside a GtkLabel, similar to +## DP: SexyUrlLabel. Port checkgmail to use this new functionality. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' checkgmail~/checkgmail checkgmail/checkgmail +--- checkgmail~/checkgmail 2010-03-19 20:42:47.314648266 +0100 ++++ checkgmail/checkgmail 2010-03-19 20:42:47.418648221 +0100 +@@ -32,9 +32,9 @@ + # + + # global variables (can't be set global in the BEGIN block) +-my ($version, $silent, $nocrypt, $update, $notsexy, $profile, $disable_monitors_check, ++my ($version, $silent, $nocrypt, $update, $profile, $disable_monitors_check, + $private, $cookies, $popup_size, $hosted_tmp, $show_popup_delay, +- $popup_persistence, $usekwallet, $libsexy, $nologin, $mailno, $debug); ++ $popup_persistence, $usekwallet, $nologin, $mailno, $debug); + BEGIN { + $version = "1.13svn"; + $silent = 1; +@@ -63,9 +63,6 @@ + $disable_monitors_check = 1; + last }; + +- /no-libsexy/ && do { +- $notsexy = 1; +- last }; + + /no-login/ && do { + $nologin = 1; +@@ -125,7 +122,7 @@ + + + print "CheckGmail v$version\nCopyright © 2005-7 Owen Marshall\n\n"; +- print "usage: checkgmail [-profile=profile_name] [-popup_delay=millisecs] [-hosted=hosted_domain] [-no_cookies] [-popup_persistence=millisecs] [-private] [-v | -verbose] [-nocrypt] [-no-libsexy] [-disable-monitors-check] [-update] [-h]\n\n"; ++ print "usage: checkgmail [-profile=profile_name] [-popup_delay=millisecs] [-hosted=hosted_domain] [-no_cookies] [-popup_persistence=millisecs] [-private] [-v | -verbose] [-nocrypt] [-disable-monitors-check] [-update] [-h]\n\n"; + exit 1; + + } +@@ -266,14 +263,7 @@ + } + } + +- # optional packages for urls in labels +- foreach (split("\n"," +- use Gtk2::Sexy; +- ")) {&$eval_sub($_)}; +- if (($failed_packages) && ($failed_packages =~ m/Sexy/i)) { +- print "\nCheckGmail uses Gtk2::Sexy for clickable URLs in mail messages\nPlease download and install from CPAN (http://search.cpan.org) if you want to use this feature ...\n\n"; +- $libsexy = 0; +- } else { $libsexy = 1 unless $notsexy; } ++ + } + + # There's something wrong with Debian's Crypt::Simple, and it's causing problems ... +@@ -1272,7 +1262,6 @@ + s//\n\n/g; + s/<\/div\\*>/\n/g; # GMail now uses div blocks for paragraphs! Who'd have thought they could be so abhorrent? + # s/(?:\n\s*){3,}/\n\n/sg; +- s/<.*?>//g unless $libsexy; + s/(.*?)<\/a>/<-a $1>$2<-\/a>/ig; + s/<[^-].*?>//g; + # s/<([\/]|[^a])[^a].*?>//g; +@@ -1854,15 +1843,12 @@ + $notify_vbox->pack_start($hbox_b,0,0,0); + + my $body_l; +- if ($libsexy) { +- $body_l = Gtk2::Sexy::UrlLabel->new; +- $body_l->signal_connect(url_activated => sub{ +- my ($url_label, $url) = @_; +- run_command($gmail_command, $url); +- }); +- } else { +- $body_l = Gtk2::Label->new; +- } ++ $body_l = Gtk2::Label->new; ++ $body_l->signal_connect(activate_link => sub{ ++ ++ my ($url_label, $url) = @_; ++ run_command($gmail_command, $url); ++ }); + $body_l->set_line_wrap(1); + # my ($w, $h) = $body_l->get_size_request; + # print "($w, $h)\n";