[Python-apps-commits] r4097 - in packages/bleachbit/trunk/debian (4 files)
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Tue Nov 10 21:46:57 UTC 2009
Date: Tuesday, November 10, 2009 @ 21:46:56
Author: dktrkranz
Revision: 4097
Refresh patches for new upstream release
Modified:
packages/bleachbit/trunk/debian/changelog
packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch
packages/bleachbit/trunk/debian/patches/desktop_file.patch
packages/bleachbit/trunk/debian/patches/no_update.patch
Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog 2009-11-10 21:30:54 UTC (rev 4096)
+++ packages/bleachbit/trunk/debian/changelog 2009-11-10 21:46:56 UTC (rev 4097)
@@ -1,8 +1,9 @@
bleachbit (0.7.1-1) unstable; urgency=low
* New upstream release.
+ * Refresh patches for new upstream release.
- -- Luca Falavigna <dktrkranz at debian.org> Tue, 10 Nov 2009 22:30:31 +0100
+ -- Luca Falavigna <dktrkranz at debian.org> Tue, 10 Nov 2009 22:46:29 +0100
bleachbit (0.7.0-1) unstable; urgency=low
Modified: packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch 2009-11-10 21:30:54 UTC (rev 4096)
+++ packages/bleachbit/trunk/debian/patches/GUI_relative_imports.patch 2009-11-10 21:46:56 UTC (rev 4097)
@@ -2,41 +2,70 @@
Origin: Debian
Forwarded: not-needed
-Index: bleachbit-0.7.0/bleachbit/GUI.py
+Index: bleachbit-0.7.1/bleachbit/GUI.py
===================================================================
---- 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 @@
+--- 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, \
+-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):
-@@ -360,7 +360,7 @@
+@@ -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 = {}
- for operation in self.get_selected_operations():
-@@ -378,7 +378,7 @@
+@@ -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()
@@ -45,7 +74,15 @@
except:
traceback.print_exc()
err = str(sys.exc_info()[1])
-@@ -461,7 +461,7 @@
+@@ -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
@@ -54,7 +91,14 @@
# preview and confirm
operations = { '_gui' : [ 'files' ] }
-@@ -491,7 +491,7 @@
+ 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')
@@ -63,7 +107,7 @@
if 0 == bytes:
text = ""
self.status_bar.push(context_id, text)
-@@ -660,9 +660,9 @@
+@@ -642,9 +642,9 @@
@threaded
def check_online_updates(self):
"""Check for software updates in background"""
@@ -75,7 +119,7 @@
if update.is_update_available():
gobject.idle_add(self.enable_online_update, update.get_update_info_url())
except:
-@@ -670,10 +670,10 @@
+@@ -652,10 +652,10 @@
def __init__(self):
Modified: packages/bleachbit/trunk/debian/patches/desktop_file.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/desktop_file.patch 2009-11-10 21:30:54 UTC (rev 4096)
+++ packages/bleachbit/trunk/debian/patches/desktop_file.patch 2009-11-10 21:46:56 UTC (rev 4097)
@@ -2,13 +2,14 @@
Origin: Debian
Forwarded: not-needed
-Index: bleachbit-0.2.1/bleachbit.desktop
+Index: bleachbit-0.7.1/bleachbit.desktop
===================================================================
---- bleachbit-0.2.1.orig/bleachbit.desktop 2009-01-29 22:10:13.625194708 +0100
-+++ bleachbit-0.2.1/bleachbit.desktop 2009-01-29 22:10:20.641192983 +0100
-@@ -29,5 +29,4 @@
+--- bleachbit-0.7.1.orig/bleachbit.desktop 2009-11-10 22:39:33.581078600 +0100
++++ bleachbit-0.7.1/bleachbit.desktop 2009-11-10 22:42:57.329068306 +0100
+@@ -65,6 +65,5 @@
Exec=bleachbit
Icon=bleachbit
Categories=GTK;System;
-Encoding=UTF-8
StartupNotify=true
+
Modified: packages/bleachbit/trunk/debian/patches/no_update.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/no_update.patch 2009-11-10 21:30:54 UTC (rev 4096)
+++ packages/bleachbit/trunk/debian/patches/no_update.patch 2009-11-10 21:46:56 UTC (rev 4097)
@@ -2,11 +2,11 @@
Origin: Debian
Forwarded: not-needed
-Index: bleachbit-0.6.1/bleachbit/Common.py
+Index: bleachbit-0.7.1/bleachbit/Common.py
===================================================================
---- bleachbit-0.6.1.orig/bleachbit/Common.py 2009-08-19 00:34:26.000000000 +0200
-+++ bleachbit-0.6.1/bleachbit/Common.py 2009-08-19 00:34:24.000000000 +0200
-@@ -42,7 +42,7 @@
+--- bleachbit-0.7.1.orig/bleachbit/Common.py 2009-11-10 22:39:33.141073245 +0100
++++ bleachbit-0.7.1/bleachbit/Common.py 2009-11-10 22:43:22.609075670 +0100
+@@ -39,7 +39,7 @@
# Setting below value to false disables update notification (useful
# for packages in repositories).
More information about the Python-apps-commits
mailing list