[Python-apps-commits] r6542 - in packages/bleachbit/trunk/debian (4 files)

[dktrkranz at users.alioth.debian.org]

    Date: Thursday, January 27, 2011 @ 22:47:41
  Author: dktrkranz
Revision: 6542

* debian/patches/gnomevfs.patch:
  - Replace gnomevfs methods, now deprecated.
* debian/control:
  - Drop python-gnome2 dependency (Closes: #605555).

Added:
  packages/bleachbit/trunk/debian/patches/gnomevfs.patch
Modified:
  packages/bleachbit/trunk/debian/changelog
  packages/bleachbit/trunk/debian/control
  packages/bleachbit/trunk/debian/patches/series

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2011-01-27 22:16:58 UTC (rev 6541)
+++ packages/bleachbit/trunk/debian/changelog	2011-01-27 22:47:41 UTC (rev 6542)
@@ -2,14 +2,17 @@
 
   * New upstream release.
   * Refresh patches for new upstream release.
+  * debian/patches/gnomevfs.patch:
+    - Replace gnomevfs methods, now deprecated.
   * debian/control:
     - Depends on python (>= 2.6) | python-simplejson.
     - Drop python-glade2 dependency.
+    - Drop python-gnome2 dependency (Closes: #605555).
     - No longer recommend menu.
   * debian/copyright:
     - Update copyright years.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 27 Jan 2011 23:16:14 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 27 Jan 2011 23:46:03 +0100
 
 bleachbit (0.8.0-1) unstable; urgency=low
 

Modified: packages/bleachbit/trunk/debian/control
===================================================================
--- packages/bleachbit/trunk/debian/control	2011-01-27 22:16:58 UTC (rev 6541)
+++ packages/bleachbit/trunk/debian/control	2011-01-27 22:47:41 UTC (rev 6542)
@@ -12,7 +12,7 @@
 
 Package: bleachbit
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python (>= 2.6) | python-simplejson, python-gtk2, python-gnome2
+Depends: ${misc:Depends}, ${python:Depends}, python (>= 2.6) | python-simplejson, python-gtk2 (>= 2.14)
 Recommends: python-notify
 Description: delete unnecessary files from the system
  BleachBit deletes unnecessary files to free valuable disk space, maintain

Added: packages/bleachbit/trunk/debian/patches/gnomevfs.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/gnomevfs.patch	                        (rev 0)
+++ packages/bleachbit/trunk/debian/patches/gnomevfs.patch	2011-01-27 22:47:41 UTC (rev 6542)
@@ -0,0 +1,49 @@
+Index: bleachbit-0.8.7/bleachbit/GuiBasic.py
+===================================================================
+--- bleachbit-0.8.7.orig/bleachbit/GuiBasic.py	2011-01-27 23:18:08.087801573 +0100
++++ bleachbit-0.8.7/bleachbit/GuiBasic.py	2011-01-27 23:34:16.742547642 +0100
+@@ -175,8 +175,7 @@
+             return
+     # open web browser
+     try:
+-        import gnomevfs
+-        gnomevfs.url_show(url)
++        gtk.show_uri(None, url, gtk.gdk.CURRENT_TIME)
+         return
+     except:
+         import webbrowser
+Index: bleachbit-0.8.7/bleachbit/Unix.py
+===================================================================
+--- bleachbit-0.8.7.orig/bleachbit/Unix.py	2011-01-27 23:18:08.071852091 +0100
++++ bleachbit-0.8.7/bleachbit/Unix.py	2011-01-27 23:20:04.531129734 +0100
+@@ -36,18 +36,11 @@
+ import FileUtilities
+ import General
+ 
+-HAVE_GNOME_VFS = True
++HAVE_GIO = True
+ try:
+-    import gnomevfs
++    import gio
+ except:
+-    try:
+-        # this is the deprecated name
+-        import gnome.vfs
+-    except:
+-        HAVE_GNOME_VFS = False
+-    else:
+-        gnomevfs = gnome.vfs
+-
++    HAVE_GIO = False
+ 
+ 
+ def guess_overwrite_paths():
+@@ -480,7 +473,7 @@
+             print "info: is_broken_xdg_menu: missing required option 'MimeType': '%s'" % (pathname)
+             return True
+         mimetype = config.get('Desktop Entry', 'MimeType').strip().lower()
+-        if HAVE_GNOME_VFS and 0 == len(gnomevfs.mime_get_all_applications(mimetype)):
++        if HAVE_GIO and 0 == len(gio.app_info_get_all_for_type(mimetype)):
+             print "info: is_broken_xdg_menu: MimeType '%s' not " \
+                 "registered '%s'" % (mimetype, pathname)
+             return True

Modified: packages/bleachbit/trunk/debian/patches/series
===================================================================
--- packages/bleachbit/trunk/debian/patches/series	2011-01-27 22:16:58 UTC (rev 6541)
+++ packages/bleachbit/trunk/debian/patches/series	2011-01-27 22:47:41 UTC (rev 6542)
@@ -1,3 +1,4 @@
 desktop_file.patch
 no_update.patch
 local_cleaners_dir.patch
+gnomevfs.patch