diff -u claws-mail-3.7.3/debian/control claws-mail-3.7.3/debian/control --- claws-mail-3.7.3/debian/control +++ claws-mail-3.7.3/debian/control @@ -1,7 +1,8 @@ Source: claws-mail Section: mail Priority: optional -Maintainer: Ricardo Mones +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ricardo Mones Uploaders: Paul Mangan , Gustavo Noronha Silva Build-Depends: debhelper (>= 5), quilt (>= 0.40), libcompfaceg1-dev, libglib2.0-dev, libgtk2.0-dev, libgpgme11-dev (>= 1.1.1), diff -u claws-mail-3.7.3/debian/changelog claws-mail-3.7.3/debian/changelog --- claws-mail-3.7.3/debian/changelog +++ claws-mail-3.7.3/debian/changelog @@ -1,3 +1,17 @@ +claws-mail (3.7.3-1ubuntu1) lucid; urgency=low + + * Merge from debian testing (LP: #458525), remaining changes: + - debian/patches/50disable_can_change_accels_by_default: + the gtk_can_change_accels pref which allows to change keyboard shortcuts + from Gtk+ menus default to false for consistence with the GNOME default + and other UME apps. + * Refreshed and DEP3-tagged the patch. + * New upstream version 3.7.3: + - Looks better with dark themes (LP: #466835) + - Handles base64-encoded e-mails correctly (LP: #447264) + + -- Ilya Barygin Sat, 14 Nov 2009 12:28:38 +0300 + claws-mail (3.7.3-1) unstable; urgency=low * New upstream release @@ -32,6 +46,33 @@ -- Ricardo Mones Sun, 20 Sep 2009 19:25:02 +0200 +claws-mail (3.7.2-1ubuntu3) karmic; urgency=low + + * 60gtk_2.18_issues.patch: from upstream, fixes incorrect update of + display with GTK+ 2.18 (LP: #446582). + + -- Ilya Barygin Sat, 10 Oct 2009 00:15:31 +0400 + +claws-mail (3.7.2-1ubuntu2) karmic; urgency=low + + * Drop claws-mail-dillo-viewer plugin since it depends on dillo (which is + being removed due to GTK 1.2 removal) + - Remove binary from debian/control + - Remove from claws-mail-plugins + - Update debian/rules to not build the plugin + + -- Scott Kitterman Mon, 14 Sep 2009 08:37:05 -0400 + +claws-mail (3.7.2-1ubuntu1) karmic; urgency=low + + * Merge with Debian unstable, remaining changes: + - debian/patches/50disable_can_change_accels_by_default: + the gtk_can_change_accels pref which allows to change keyboard shortcuts + from Gtk+ menus default to false for consistence with the GNOME default + and other UME apps. + + -- Iain Lane Sat, 04 Jul 2009 16:47:18 +0100 + claws-mail (3.7.2-1) unstable; urgency=low * New upstream release @@ -49,6 +90,25 @@ -- Ricardo Mones Fri, 03 Jul 2009 16:42:03 +0200 +claws-mail (3.7.1-2ubuntu2) karmic; urgency=low + + * debian/patches/09use_xdg_open.patch: Switch to using xdg-open instead of + x-www-browser as this respects the user's choice of default browser. + + -- Iain Lane Sun, 21 Jun 2009 15:46:56 +0100 + +claws-mail (3.7.1-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches/50disable_can_change_accels_by_default: + the gtk_can_change_accels pref which allows to change keyboard shortcuts + from Gtk+ menus default to false for consistence with the GNOME default + and other UME apps. + * Rename 12disable_can_change_accels_by_default to + 50disable_can_change_accels_by_default to avoid collisions + + -- Laurent Bigonville Tue, 05 May 2009 15:48:35 +0200 + claws-mail (3.7.1-2) unstable; urgency=low * debian/control @@ -60,6 +120,16 @@ -- Ricardo Mones Fri, 01 May 2009 18:43:51 +0200 +claws-mail (3.7.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #310311) + - debian/patches/12disable_can_change_accels_by_default: + the gtk_can_change_accels pref which allows to change keyboard shortcuts + from Gtk+ menus default to false for consistence with the GNOME default + and other UME apps. + + -- Laurent Bigonville Tue, 28 Apr 2009 20:42:25 +0200 + claws-mail (3.7.1-1) unstable; urgency=low * New upstream release @@ -85,6 +155,16 @@ -- Ricardo Mones Wed, 24 Dec 2008 20:34:02 +0100 +claws-mail (3.6.1-1ubuntu1) jaunty; urgency=low + + * Merge from debian experimental (LP: #306594), remaining changes: + - debian/patches/12disable_can_change_accels_by_default: + the gtk_can_change_accels pref which allows to change keyboard shortcuts + from Gtk+ menus default to false for consistence with the GNOME default + and other UME apps. + + -- Cesare Tirabassi Wed, 10 Dec 2008 16:56:59 +0100 + claws-mail (3.6.1-1) experimental; urgency=low * New upstream release @@ -112,6 +192,21 @@ -- Ricardo Mones Sat, 04 Oct 2008 19:21:01 +0200 +claws-mail (3.5.0-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches/12disable_can_change_accels_by_default: + the gtk_can_change_accels pref which allows to change keyboard shortcuts + from Gtk+ menus default to false for consistence with the GNOME default + and other UME apps. + - Modify Maintainer value to match the DebianMaintainerField + specification. + * Add debian/patches/13fix_ftbfs_with_gtk+-2.13.x.patch: + fix build failure with gtk+2.13.x (LP: #247909) + http://www.colino.net/claws-mail/getpatchset.php?ver=3.5.0cvs10 + + -- Cesare Tirabassi Sat, 12 Jul 2008 12:21:29 +0200 + claws-mail (3.5.0-2) unstable; urgency=low * debian/control @@ -137,6 +232,27 @@ -- Ricardo Mones Sat, 28 Jun 2008 00:18:16 +0200 +claws-mail (3.4.0-2ubuntu1) intrepid; urgency=low + + [ Michael Terry ] + * New patch, 12disable_can_change_accels_by_default, let + the gtk_can_change_accels pref which allows to change keyboard shortcuts + from Gtk+ menus default to false for consistence with the GNOME default + and other UME apps; LP: #223840. + + [ Loic Minier ] + * Tweak above changelog entry to clarify actual change. + * Tune Ubuntu revision. + * Update upload date. + + -- Michael Terry Tue, 17 Jun 2008 23:07:14 +0200 + +claws-mail (3.4.0-2build1) intrepid; urgency=low + + * Rebuild for libetpan13 + + -- Stephan Hermann Fri, 23 May 2008 10:56:03 +0200 + claws-mail (3.4.0-2) unstable; urgency=low * debian/control diff -u claws-mail-3.7.3/debian/patches/series claws-mail-3.7.3/debian/patches/series --- claws-mail-3.7.3/debian/patches/series +++ claws-mail-3.7.3/debian/patches/series @@ -2,0 +3 @@ +50disable_can_change_accels_by_default only in patch2: unchanged: --- claws-mail-3.7.3.orig/debian/patches/50disable_can_change_accels_by_default +++ claws-mail-3.7.3/debian/patches/50disable_can_change_accels_by_default @@ -0,0 +1,22 @@ +Description: disable the gtk_can_change_accels preference + gtk_can_change_accels allows to change keyboard shortcuts from Gtk+ menus. + Set default to false for consistence with the GNOME default and other + UME apps. Rejected by upstream because users who are familiar with this + feature would be unhappy with it disabled. +Origin: vendor, https://launchpad.net/bugs/223840 +Bug-Ubuntu: https://launchpad.net/bugs/223840 +Author: Michael Terry + +Index: claws-mail-3.7.3/src/prefs_common.c +=================================================================== +--- claws-mail-3.7.3.orig/src/prefs_common.c 2009-11-14 12:08:30.000000000 +0300 ++++ claws-mail-3.7.3/src/prefs_common.c 2009-11-14 12:39:38.000000000 +0300 +@@ -920,7 +920,7 @@ + {"filtering_debug_log_length", "500", &prefs_common.filtering_debug_loglength, P_INT, + NULL, NULL, NULL}, + +- {"gtk_can_change_accels", "TRUE", &prefs_common.gtk_can_change_accels, P_BOOL, ++ {"gtk_can_change_accels", "FALSE", &prefs_common.gtk_can_change_accels, P_BOOL, + NULL, NULL, NULL}, + + {"color_new", "#0000b3", &prefs_common.color_new, P_COLOR,