[Python-apps-commits] r3880 - in packages/bleachbit/trunk/debian (3 files)

[dktrkranz at users.alioth.debian.org]

    Date: Thursday, October 1, 2009 @ 20:05:46
  Author: dktrkranz
Revision: 3880

Do not use absolute imports, we install bleachbit module in a private directory

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

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2009-10-01 19:47:06 UTC (rev 3879)
+++ packages/bleachbit/trunk/debian/changelog	2009-10-01 20:05:46 UTC (rev 3880)
@@ -1,8 +1,11 @@
 bleachbit (0.6.5-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/patches/GUI_relative_imports.patch:
+    - Do not use absolute imports, we install bleachbit module in a
+      private directory.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 01 Oct 2009 21:42:32 +0200
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 01 Oct 2009 22:02:24 +0200
 
 bleachbit (0.6.4-1) unstable; urgency=low
 

Added: packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch	                        (rev 0)
+++ packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch	2009-10-01 20:05:46 UTC (rev 3880)
@@ -0,0 +1,95 @@
+Description: Do not use absolute imports, we install bleachbit module in a private directory.
+Origin: Debian
+Forwarded: not-needed
+
+Index: bleachbit-0.6.5/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
+@@ -34,14 +34,14 @@
+ import gobject
+ warnings.simplefilter('default')
+ 
+-from bleachbit.Common import APP_NAME, APP_VERSION, APP_URL, appicon_path, \
++from Common import APP_NAME, APP_VERSION, APP_URL, appicon_path, \
+     help_contents_url, license_filename, online_update_notification_enabled, \
+     release_notes_url
+-from bleachbit.Cleaner import backends
+-from bleachbit.GuiPreferences import PreferencesDialog
+-from bleachbit.Options import options
+-import bleachbit.Cleaner
+-import bleachbit.FileUtilities
++from Cleaner import backends
++from GuiPreferences import PreferencesDialog
++from Options import options
++import Cleaner
++import FileUtilities
+ 
+ 
+ def open_url(url):
+@@ -359,7 +359,7 @@
+         """Preview operations or run operations (delete files)"""
+ 
+         assert(type(really_delete) is bool)
+-        import bleachbit.Worker
++        import Worker
+         if None == operations:
+             operations = {}
+             for operation in self.get_selected_operations():
+@@ -377,7 +377,7 @@
+             self.set_sensitive(False)
+             self.textbuffer.set_text("")
+             self.progressbar.show()
+-            self.worker = bleachbit.Worker.Worker(self, really_delete, operations)
++            self.worker = Worker.Worker(self, really_delete, operations)
+         except:
+             traceback.print_exc()
+             err = str(sys.exc_info()[1])
+@@ -460,11 +460,11 @@
+             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 @@
+     def update_total_size(self, bytes):
+         """Callback to update the total size cleaned"""
+         context_id = self.status_bar.get_context_id('size')
+-        text = bleachbit.FileUtilities.bytes_to_human(bytes)
++        text = FileUtilities.bytes_to_human(bytes)
+         if 0 == bytes:
+             text = ""
+         self.status_bar.push(context_id, text)
+@@ -668,17 +668,17 @@
+     @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())
+ 
+ 
+     def __init__(self):
+-        import bleachbit.RecognizeCleanerML
+-        bleachbit.RecognizeCleanerML.RecognizeCleanerML()
+-        import bleachbit.CleanerML
+-        bleachbit.CleanerML.load_cleaners()
++        import RecognizeCleanerML
++        RecognizeCleanerML.RecognizeCleanerML()
++        import CleanerML
++        CleanerML.load_cleaners()
+         self.create_window()
+         gobject.threads_init()
+         if options.get("first_start") and sys.platform == 'linux2':

Modified: packages/bleachbit/trunk/debian/patches/series
===================================================================
--- packages/bleachbit/trunk/debian/patches/series	2009-10-01 19:47:06 UTC (rev 3879)
+++ packages/bleachbit/trunk/debian/patches/series	2009-10-01 20:05:46 UTC (rev 3880)
@@ -1,2 +1,3 @@
 desktop_file.patch
 no_update.patch
+GUI_relative_imports.patch