[Python-apps-commits] r6558 - in packages/gtg/trunk/debian (4 files)

[dktrkranz at users.alioth.debian.org]

    Date: Friday, January 28, 2011 @ 21:17:32
  Author: dktrkranz
Revision: 6558

* debian/patches/gnome2.patch:
  - Drop obsolete python-gnome2 methods.
* debian/control:
  - Drop python-gnome2 dependency (Closes: #611097).

Added:
  packages/gtg/trunk/debian/patches/gnome2.patch
Modified:
  packages/gtg/trunk/debian/changelog
  packages/gtg/trunk/debian/control
  packages/gtg/trunk/debian/patches/series

Modified: packages/gtg/trunk/debian/changelog
===================================================================
--- packages/gtg/trunk/debian/changelog	2011-01-28 21:04:59 UTC (rev 6557)
+++ packages/gtg/trunk/debian/changelog	2011-01-28 21:17:32 UTC (rev 6558)
@@ -1,14 +1,17 @@
 gtg (0.2.4-5) UNRELEASED; urgency=low
 
   * Switch to dh_python2.
+  * debian/patches/gnome2.patch:
+    - Drop obsolete python-gnome2 methods.
   * debian/control:
     - Depend on python-simplejson | python (>= 2.6).
+    - Drop python-gnome2 dependency (Closes: #611097).
   * debian/copyright:
     - Update copyright years.
   * debian/rules:
     - Delete unused .egg-info file.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Fri, 28 Jan 2011 22:04:04 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Fri, 28 Jan 2011 22:16:27 +0100
 
 gtg (0.2.4-4) unstable; urgency=low
 

Modified: packages/gtg/trunk/debian/control
===================================================================
--- packages/gtg/trunk/debian/control	2011-01-28 21:04:59 UTC (rev 6557)
+++ packages/gtg/trunk/debian/control	2011-01-28 21:17:32 UTC (rev 6558)
@@ -13,7 +13,7 @@
 
 Package: gtg
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-simplejson | python (>= 2.6), python-gtk2 (>= 2.14), python-gnome2, python-glade2, python-dbus, python-xdg, python-configobj
+Depends: ${misc:Depends}, ${python:Depends}, python-simplejson | python (>= 2.6), python-gtk2 (>= 2.14), python-glade2, python-dbus, python-xdg, python-configobj
 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

Added: packages/gtg/trunk/debian/patches/gnome2.patch
===================================================================
--- packages/gtg/trunk/debian/patches/gnome2.patch	                        (rev 0)
+++ packages/gtg/trunk/debian/patches/gnome2.patch	2011-01-28 21:17:32 UTC (rev 6558)
@@ -0,0 +1,31 @@
+Drop obsolete python-gnome2 methods.
+
+Index: gtg-0.2.4/GTG/tools/openurl.py
+===================================================================
+--- gtg-0.2.4.orig/GTG/tools/openurl.py	2011-01-28 22:14:09.837602575 +0100
++++ gtg-0.2.4/GTG/tools/openurl.py	2011-01-28 22:15:01.348606020 +0100
+@@ -25,10 +25,10 @@
+ import sys as _sys
+ 
+ try:
+-    import gnome as _gnome
+-    _has_gnome = True
++    import gtk as _gtk
++    _has_gtk = True
+ except ImportError:
+-    _has_gnome = False
++    _has_gtk = False
+ 
+ def _spawn_executable(close_stdout = False, close_stderr = False, *args):
+     pid = _os.fork()
+@@ -62,8 +62,8 @@
+ def openurl(url):
+     if _has_xdg: # freedesktop is the best choice :p
+         return _spawn_quiet('xdg-open', url)
+-    elif _has_gnome: # shouldn't also check for gnome-open ?
+-        return _gnome.url_show(url)
++    elif _has_gtk:
++        return _gtk.show_uri(None, url, _gtk.gdk.CURRENT_TIME)
+     elif _has_exo: # for xfce
+         return _spawn_quiet('exo-open', url)
+     # add your favorite desktop here ;)

Modified: packages/gtg/trunk/debian/patches/series
===================================================================
--- packages/gtg/trunk/debian/patches/series	2011-01-28 21:04:59 UTC (rev 6557)
+++ packages/gtg/trunk/debian/patches/series	2011-01-28 21:17:32 UTC (rev 6558)
@@ -3,3 +3,4 @@
 xml_temp_file.patch
 x_is_running.patch
 locale.patch
+gnome2.patch