[Python-apps-commits] r4222 - in packages/bleachbit/trunk/debian (3 files)
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Wed Dec 2 20:39:56 UTC 2009
Date: Wednesday, December 2, 2009 @ 20:39:55
Author: dktrkranz
Revision: 4222
debian/patches/GUI_relative_imports.patch applied upstream
Modified:
packages/bleachbit/trunk/debian/changelog
packages/bleachbit/trunk/debian/patches/series
Deleted:
packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch
Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog 2009-12-02 20:34:28 UTC (rev 4221)
+++ packages/bleachbit/trunk/debian/changelog 2009-12-02 20:39:55 UTC (rev 4222)
@@ -1,8 +1,10 @@
bleachbit (0.7.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * debian/patches/GUI_relative_imports.patch:
+ - Removed, applied upstream.
- -- Luca Falavigna <dktrkranz at debian.org> Wed, 02 Dec 2009 21:33:53 +0100
+ -- Luca Falavigna <dktrkranz at debian.org> Wed, 02 Dec 2009 21:39:21 +0100
bleachbit (0.7.1-1) unstable; urgency=low
Deleted: packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch 2009-12-02 20:34:28 UTC (rev 4221)
+++ packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch 2009-12-02 20:39:55 UTC (rev 4222)
@@ -1,136 +0,0 @@
-Description: Do not use absolute imports, we install bleachbit module in a private directory.
-Origin: Debian
-Forwarded: not-needed
-
-Index: bleachbit-0.7.1/bleachbit/GUI.py
-===================================================================
---- bleachbit-0.7.1.orig/bleachbit/GUI.py 2009-11-08 22:53:14.000000000 +0100
-+++ bleachbit-0.7.1/bleachbit/GUI.py 2009-11-10 22:45:50.065074622 +0100
-@@ -34,15 +34,15 @@
- 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.GuiBasic
--import bleachbit.FileUtilities
-+from Cleaner import backends
-+from GuiPreferences import PreferencesDialog
-+from Options import options
-+import Cleaner
-+import GuiBasic
-+import FileUtilities
-
-
- def open_url(url):
-@@ -177,7 +177,7 @@
- # when toggling an option, present any warnings
- warning = backends[cleaner_id].get_warning(option_id)
- if warning:
-- resp = bleachbit.GuiBasic.message_dialog(parent_window, \
-+ resp = GuiBasic.message_dialog(parent_window, \
- warning, \
- gtk.MESSAGE_WARNING, gtk.BUTTONS_OK_CANCEL)
- if gtk.RESPONSE_OK != resp:
-@@ -320,7 +320,7 @@
- def run_operations(self, __widget):
- """Event when the 'delete' toolbar button is clicked."""
- # fixme: should present this dialog after finding operations
-- if not bleachbit.GuiBasic.delete_confirmation_dialog(self.window, True):
-+ if not GuiBasic.delete_confirmation_dialog(self.window, True):
- return
- self.preview_or_run_operations(True)
-
-@@ -329,7 +329,7 @@
- """Preview operations or run operations (delete files)"""
-
- assert(isinstance(really_delete, bool))
-- import bleachbit.Worker
-+ import Worker
- self.start_time = None
- if None == operations:
- operations = {}
-@@ -337,7 +337,7 @@
- operations[operation] = self.get_operation_options(operation)
- assert(isinstance(operations, dict))
- if 0 == len(operations):
-- bleachbit.GuiBasic.message_dialog(self.window, \
-+ GuiBasic.message_dialog(self.window, \
- _("You must select an operation"),
- gtk.MESSAGE_WARNING, gtk.BUTTONS_OK)
- return
-@@ -345,7 +345,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])
-@@ -433,20 +433,20 @@
- """Callback for shredding a file"""
-
- # get list of files
-- paths = bleachbit.GuiBasic.browse_files(self.window, \
-+ paths = GuiBasic.browse_files(self.window, \
- _("Choose files to shred"))
-
- if not paths:
- return
-
- # create a temporary cleaner object
-- backends['_gui'] = bleachbit.Cleaner.create_simple_cleaner(paths)
-+ backends['_gui'] = Cleaner.create_simple_cleaner(paths)
-
- # preview and confirm
- operations = { '_gui' : [ 'files' ] }
- self.preview_or_run_operations(False, operations)
-
-- if bleachbit.GuiBasic.delete_confirmation_dialog(self.window, mention_preview = False):
-+ if GuiBasic.delete_confirmation_dialog(self.window, mention_preview = False):
- # delete
- options.set('shred', True, commit = False)
- self.preview_or_run_operations(True, operations)
-@@ -470,7 +470,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)
-@@ -642,9 +642,9 @@
- @threaded
- def check_online_updates(self):
- """Check for software updates in background"""
-- import bleachbit.Update
-+ import Update
- 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:
-@@ -652,10 +652,10 @@
-
-
- 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 'posix' == os.name:
Modified: packages/bleachbit/trunk/debian/patches/series
===================================================================
--- packages/bleachbit/trunk/debian/patches/series 2009-12-02 20:34:28 UTC (rev 4221)
+++ packages/bleachbit/trunk/debian/patches/series 2009-12-02 20:39:55 UTC (rev 4222)
@@ -1,3 +1,2 @@
desktop_file.patch
no_update.patch
-GUI_relative_imports.patch
More information about the Python-apps-commits
mailing list