diff -Nru gtg-0.2.4/debian/changelog gtg-0.2.4/debian/changelog --- gtg-0.2.4/debian/changelog 2011-02-06 17:53:46.000000000 +0000 +++ gtg-0.2.4/debian/changelog 2011-08-11 19:23:05.000000000 +0000 @@ -1,3 +1,16 @@ +gtg (0.2.4-6) unstable; urgency=low + + * debian/patches/*.patch: + - Use DEP3 headers in patches. + * debian/patches/select_right_clicked_tasks.patch: + - Change selection when right-clicking on a different task, + patch cherry-picked by Jérôme Guelfucci (Closes: #624225). + * debian/control: + - Add python-simplejson to Recommends (Closes: #585629). + - Bump Standards-Version to 3.9.2. + + -- Luca Falavigna Thu, 11 Aug 2011 21:20:24 +0200 + gtg (0.2.4-5) unstable; urgency=low * Switch to dh_python2. diff -Nru gtg-0.2.4/debian/control gtg-0.2.4/debian/control --- gtg-0.2.4/debian/control 2011-01-28 21:17:32.000000000 +0000 +++ gtg-0.2.4/debian/control 2011-08-11 19:04:39.000000000 +0000 @@ -4,8 +4,8 @@ Maintainer: Luca Falavigna Uploaders: Python Applications Packaging Team Build-Depends: debhelper (>= 7.0.50~) -Build-Depends-Indep: python (>= 2.6.5-2~) -Standards-Version: 3.9.1 +Build-Depends-Indep: python (>= 2.6.6-3~) +Standards-Version: 3.9.2 X-Python-Version: >= 2.5 Homepage: http://gtg.fritalk.com/ Vcs-Svn: svn://svn.debian.org/python-apps/packages/gtg/trunk/ @@ -13,7 +13,8 @@ Package: gtg Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-simplejson | python (>= 2.6), python-gtk2 (>= 2.14), python-glade2, python-dbus, python-xdg, python-configobj +Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.14), python-glade2, python-dbus, python-xdg, python-configobj +Recommends: python-simplejson Description: organizer for the GNOME desktop environment Getting Things GNOME! is an organizer for the GNOME desktop environment. GTG focuses on usability and ease of use. Its main objective is to diff -Nru gtg-0.2.4/debian/patches/gnome2.patch gtg-0.2.4/debian/patches/gnome2.patch --- gtg-0.2.4/debian/patches/gnome2.patch 2011-01-28 21:17:32.000000000 +0000 +++ gtg-0.2.4/debian/patches/gnome2.patch 2011-08-11 17:34:26.000000000 +0000 @@ -1,4 +1,5 @@ -Drop obsolete python-gnome2 methods. +Description: Drop obsolete python-gnome2 methods +Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/927 Index: gtg-0.2.4/GTG/tools/openurl.py =================================================================== diff -Nru gtg-0.2.4/debian/patches/locale.patch gtg-0.2.4/debian/patches/locale.patch --- gtg-0.2.4/debian/patches/locale.patch 2010-09-05 08:56:49.000000000 +0000 +++ gtg-0.2.4/debian/patches/locale.patch 2011-08-11 17:34:26.000000000 +0000 @@ -1,4 +1,5 @@ -Use bindtextdomain to simplify locale handling +Description: Use bindtextdomain to simplify locale handling +Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/878 Index: gtg-0.2.4/GTG/__init__.py =================================================================== diff -Nru gtg-0.2.4/debian/patches/reaper_hang.patch gtg-0.2.4/debian/patches/reaper_hang.patch --- gtg-0.2.4/debian/patches/reaper_hang.patch 2010-06-24 18:21:28.000000000 +0000 +++ gtg-0.2.4/debian/patches/reaper_hang.patch 2011-08-11 17:34:26.000000000 +0000 @@ -1,4 +1,5 @@ -Do not hang on quit due to "completed tasks remover" plugin +Description: Do not hang on quit due to "completed tasks remover" plugin +Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/749 Index: gtg-0.2.4/GTG/core/plugins/engine.py =================================================================== diff -Nru gtg-0.2.4/debian/patches/select_right_clicked_tasks.patch gtg-0.2.4/debian/patches/select_right_clicked_tasks.patch --- gtg-0.2.4/debian/patches/select_right_clicked_tasks.patch 1970-01-01 00:00:00.000000000 +0000 +++ gtg-0.2.4/debian/patches/select_right_clicked_tasks.patch 2011-08-11 18:51:26.000000000 +0000 @@ -0,0 +1,22 @@ +Description: Change selection when right-clicking on a different task +Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/928 + +Index: gtg-0.2.4/GTG/taskbrowser/browser.py +=================================================================== +--- gtg-0.2.4.orig/GTG/taskbrowser/browser.py 2011-04-26 18:47:12.000000000 +0200 ++++ gtg-0.2.4/GTG/taskbrowser/browser.py 2011-04-26 18:54:50.000000000 +0200 +@@ -1448,8 +1448,12 @@ + time = event.time + pthinfo = treeview.get_path_at_pos(x, y) + if pthinfo is not None: +- if treeview.get_selection().count_selected_rows() <= 0: +- path, col, cellx, celly = pthinfo ++ path, col, cellx, celly = pthinfo ++ selection = treeview.get_selection() ++ if selection.count_selected_rows() > 0 : ++ if not selection.path_is_selected(path) : ++ treeview.set_cursor(path, col, 0) ++ else : + treeview.set_cursor(path, col, 0) + treeview.grab_focus() + self.taskpopup.popup(None, None, None, event.button, time) diff -Nru gtg-0.2.4/debian/patches/series gtg-0.2.4/debian/patches/series --- gtg-0.2.4/debian/patches/series 2011-01-28 21:17:32.000000000 +0000 +++ gtg-0.2.4/debian/patches/series 2011-08-11 18:51:26.000000000 +0000 @@ -4,3 +4,4 @@ x_is_running.patch locale.patch gnome2.patch +select_right_clicked_tasks.patch diff -Nru gtg-0.2.4/debian/patches/test_executable.patch gtg-0.2.4/debian/patches/test_executable.patch --- gtg-0.2.4/debian/patches/test_executable.patch 2010-06-24 18:12:31.000000000 +0000 +++ gtg-0.2.4/debian/patches/test_executable.patch 2011-08-11 17:34:26.000000000 +0000 @@ -1,5 +1,6 @@ -Do not launch program to see if it is available, check if it -is installed and has executable bit enable instead. +Description: Do not launch program to see if it is available, check if it is + installed and has executable bit enable instead +Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/714 Index: gtg-0.2.4/GTG/tools/openurl.py =================================================================== diff -Nru gtg-0.2.4/debian/patches/x_is_running.patch gtg-0.2.4/debian/patches/x_is_running.patch --- gtg-0.2.4/debian/patches/x_is_running.patch 2010-09-05 09:51:24.000000000 +0000 +++ gtg-0.2.4/debian/patches/x_is_running.patch 2011-08-11 17:34:26.000000000 +0000 @@ -1,4 +1,5 @@ -Check if a display is available instead of relying on xset +Description: Check if a display is available instead of relying on xset +Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/877 Index: gtg-0.2.4/gtg =================================================================== diff -Nru gtg-0.2.4/debian/patches/xml_temp_file.patch gtg-0.2.4/debian/patches/xml_temp_file.patch --- gtg-0.2.4/debian/patches/xml_temp_file.patch 2010-08-07 11:11:56.000000000 +0000 +++ gtg-0.2.4/debian/patches/xml_temp_file.patch 2011-08-11 17:34:26.000000000 +0000 @@ -1,4 +1,6 @@ -Use temp files to temporarily store GTG status, to avoid generating empty XML files. +Description: Use temp files to temporarily store GTG status to avoid generating + empty XML files +Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/756 Index: gtg-0.2.4/GTG/tools/cleanxml.py ===================================================================