[Python-apps-commits] r4875 - in packages/gtg/trunk/debian (2 files)

[dktrkranz at users.alioth.debian.org]

    Date: Monday, March 1, 2010 @ 13:21:39
  Author: dktrkranz
Revision: 4875

Refresh patch with new compatibility fixes

Modified:
  packages/gtg/trunk/debian/changelog
  packages/gtg/trunk/debian/patches/py2.5_compat.patch

Modified: packages/gtg/trunk/debian/changelog
===================================================================
--- packages/gtg/trunk/debian/changelog	2010-03-01 12:52:15 UTC (rev 4874)
+++ packages/gtg/trunk/debian/changelog	2010-03-01 13:21:39 UTC (rev 4875)
@@ -1,10 +1,12 @@
 gtg (0.2.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/py2.5_compat.patch:
+    - Refresh with new compatibility fixes.
   * debian/copyright:
     - Add new copyright holders and adjust copyright years.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Mon, 01 Mar 2010 13:51:27 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Mon, 01 Mar 2010 13:20:51 +0000
 
 gtg (0.2.1-1) unstable; urgency=low
 

Modified: packages/gtg/trunk/debian/patches/py2.5_compat.patch
===================================================================
--- packages/gtg/trunk/debian/patches/py2.5_compat.patch	2010-03-01 12:52:15 UTC (rev 4874)
+++ packages/gtg/trunk/debian/patches/py2.5_compat.patch	2010-03-01 13:21:39 UTC (rev 4875)
@@ -1,16 +1,30 @@
-Description: Python 2.5 compatibility fix
-Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/560
+Description: Python 2.5 compatibility fixes
+Origin: http://bazaar.launchpad.net/~gtg/gtg/trunk/revision/660
 
-Index: gtg-0.2.1/GTG/core/plugins/api.py
+Index: gtg-0.2.2/GTG/plugins/rtm_sync/rtmProxy.py
 ===================================================================
---- gtg-0.2.1.orig/GTG/core/plugins/api.py	2010-02-01 20:06:38.819870167 +0100
-+++ gtg-0.2.1/GTG/core/plugins/api.py	2010-02-01 20:06:36.871872118 +0100
-@@ -17,6 +17,8 @@
+--- gtg-0.2.2.orig/GTG/plugins/rtm_sync/rtmProxy.py	2010-03-01 13:11:37.000000000 +0000
++++ gtg-0.2.2/GTG/plugins/rtm_sync/rtmProxy.py	2010-03-01 13:11:51.000000000 +0000
+@@ -13,6 +13,9 @@
+ #
+ # You should have received a copy of the GNU General Public License along with
  # this program.  If not, see <http://www.gnu.org/licenses/>.
- # -----------------------------------------------------------------------------
- 
++
 +from __future__ import with_statement
 +
  import os
- import pickle
- from xdg.BaseDirectory import xdg_config_home
+ import sys
+ #import time
+Index: gtg-0.2.2/GTG/plugins/tomboy/tomboy.py
+===================================================================
+--- gtg-0.2.2.orig/GTG/plugins/tomboy/tomboy.py	2010-03-01 13:12:06.000000000 +0000
++++ gtg-0.2.2/GTG/plugins/tomboy/tomboy.py	2010-03-01 13:12:14.000000000 +0000
+@@ -185,7 +185,7 @@
+         try:
+             obj = bus.get_object("org.gnome.Tomboy",
+                                "/org/gnome/Tomboy/RemoteControl")
+-        except dbus.DBusException as exception:
++        except dbus.DBusException, exception:
+             if not hasattr(self, "disable_flag"):
+                 dialog = gtk.MessageDialog(parent = \
+                      self.plugin_api.get_window(),