[Python-apps-commits] r4032 - in packages/bleachbit/trunk/debian (2 files)

[dktrkranz at users.alioth.debian.org]

    Date: Thursday, October 22, 2009 @ 19:48:34
  Author: dktrkranz
Revision: 4032

Refresh patches for new upstream release

Modified:
  packages/bleachbit/trunk/debian/changelog
  packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2009-10-22 19:33:13 UTC (rev 4031)
+++ packages/bleachbit/trunk/debian/changelog	2009-10-22 19:48:34 UTC (rev 4032)
@@ -1,8 +1,10 @@
 bleachbit (0.7.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/GUI_relative_imports.patch:
+    - Refreshed for new upstream release.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 22 Oct 2009 21:27:24 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 22 Oct 2009 21:47:40 +0200
 
 bleachbit (0.6.5-1) unstable; urgency=low
 

Modified: packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch	2009-10-22 19:33:13 UTC (rev 4031)
+++ packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch	2009-10-22 19:48:34 UTC (rev 4032)
@@ -2,10 +2,10 @@
 Origin: Debian
 Forwarded: not-needed
 
-Index: bleachbit-0.6.5/bleachbit/GUI.py
+Index: bleachbit-0.7.0/bleachbit/GUI.py
 ===================================================================
---- bleachbit-0.6.5.orig/bleachbit/GUI.py	2009-10-01 21:59:35.920145629 +0200
-+++ bleachbit-0.6.5/bleachbit/GUI.py	2009-10-01 21:59:29.484137953 +0200
+--- bleachbit-0.7.0.orig/bleachbit/GUI.py	2009-10-22 21:43:12.373639804 +0200
++++ bleachbit-0.7.0/bleachbit/GUI.py	2009-10-22 21:44:16.757639828 +0200
 @@ -34,14 +34,14 @@
  import gobject
  warnings.simplefilter('default')
@@ -27,16 +27,16 @@
  
  
  def open_url(url):
-@@ -359,7 +359,7 @@
+@@ -360,7 +360,7 @@
          """Preview operations or run operations (delete files)"""
  
-         assert(type(really_delete) is bool)
+         assert(isinstance(really_delete, bool))
 -        import bleachbit.Worker
 +        import Worker
          if None == operations:
              operations = {}
              for operation in self.get_selected_operations():
-@@ -377,7 +377,7 @@
+@@ -378,7 +378,7 @@
              self.set_sensitive(False)
              self.textbuffer.set_text("")
              self.progressbar.show()
@@ -45,22 +45,16 @@
          except:
              traceback.print_exc()
              err = str(sys.exc_info()[1])
-@@ -460,11 +460,11 @@
+@@ -461,7 +461,7 @@
              return
  
          # create a temporary cleaner object
--        cleaner = bleachbit.Cleaner.Cleaner()
-+        cleaner = Cleaner.Cleaner()
-         cleaner.add_option('files', 'files', '')
-         cleaner.name = ''
--        import bleachbit.Action
--        class CustomFileAction(bleachbit.Action.ActionProvider):
-+        import Action
-+        class CustomFileAction(Action.ActionProvider):
-             def list_files(self):
-                 for path in paths:
-                     yield path
-@@ -500,7 +500,7 @@
+-        backends['_gui'] = bleachbit.Cleaner.create_simple_cleaner(paths)
++        backends['_gui'] = Cleaner.create_simple_cleaner(paths)
+ 
+         # preview and confirm
+         operations = { '_gui' : [ 'files' ] }
+@@ -491,7 +491,7 @@
      def update_total_size(self, bytes):
          """Callback to update the total size cleaned"""
          context_id = self.status_bar.get_context_id('size')
@@ -69,16 +63,19 @@
          if 0 == bytes:
              text = ""
          self.status_bar.push(context_id, text)
-@@ -668,17 +668,17 @@
+@@ -660,9 +660,9 @@
      @threaded
      def check_online_updates(self):
          """Check for software updates in background"""
 -        import bleachbit.Update
--        update = bleachbit.Update.Update()
 +        import Update
-+        update = Update.Update()
-         if update.is_update_available():
-             gobject.idle_add(self.enable_online_update, update.get_update_info_url())
+         try:
+-            update = bleachbit.Update.Update()
++            update = Update.Update()
+             if update.is_update_available():
+                 gobject.idle_add(self.enable_online_update, update.get_update_info_url())
+         except:
+@@ -670,10 +670,10 @@
  
  
      def __init__(self):
@@ -92,4 +89,4 @@
 +        CleanerML.load_cleaners()
          self.create_window()
          gobject.threads_init()
-         if options.get("first_start") and sys.platform == 'linux2':
+         if options.get("first_start") and 'posix' == os.name: