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

[dktrkranz-guest at users.alioth.debian.org]

    Date: Sunday, April 19, 2009 @ 13:00:24
  Author: dktrkranz-guest
Revision: 2769

Remove patches merged upstream:
 - debian/patches/LANG_env
 - debian/patches/no_X

Modified:
  packages/bleachbit/trunk/debian/changelog
  packages/bleachbit/trunk/debian/patches/series
Deleted:
  packages/bleachbit/trunk/debian/patches/LANG_env
  packages/bleachbit/trunk/debian/patches/no_X

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2009-04-19 12:58:25 UTC (rev 2768)
+++ packages/bleachbit/trunk/debian/changelog	2009-04-19 13:00:24 UTC (rev 2769)
@@ -2,6 +2,9 @@
 
   * New upstream release.
     - French translation improved (Closes: #518951).
+  * Remove patches merged upstream:
+    - debian/patches/LANG_env
+    - debian/patches/no_X
 
  -- Luca Falavigna <dktrkranz at ubuntu.com>  Sun, 19 Apr 2009 14:50:20 +0200
 

Deleted: packages/bleachbit/trunk/debian/patches/LANG_env
===================================================================
--- packages/bleachbit/trunk/debian/patches/LANG_env	2009-04-19 12:58:25 UTC (rev 2768)
+++ packages/bleachbit/trunk/debian/patches/LANG_env	2009-04-19 13:00:24 UTC (rev 2769)
@@ -1,27 +0,0 @@
-Fix AttributeError if LANG is not set.
-http://bugs.debian.org/519027
-https://launchpad.net/bugs/340819
-
-Index: bleachbit-0.4.0/bleachbit/Options.py
-===================================================================
---- bleachbit-0.4.0.orig/bleachbit/Options.py	2009-04-06 11:46:26.000000000 +0200
-+++ bleachbit-0.4.0/bleachbit/Options.py	2009-04-06 11:47:14.000000000 +0200
-@@ -51,13 +51,14 @@
-         if not self.config.has_section('preserve_languages'):
-             import locale
-             lang = locale.getdefaultlocale()[0]
--            pos = lang.find('_')
--            if -1 != pos:
--                lang = lang [0 : pos]
-             if None == lang:
-                 lang = 'en'
-                 print "warning: No default language found.  Assuming '%s'" % lang
--            print "info: automatically preserving language '%s'" % (lang,)
-+            else:
-+                pos = lang.find('_')
-+                if -1 != pos:
-+                    lang = lang [0 : pos]
-+            print "info: automatically preserving language '%s'" % lang
-             self.set_language(lang, True)
- 
-         # BleachBit upgrade or first start ever

Deleted: packages/bleachbit/trunk/debian/patches/no_X
===================================================================
--- packages/bleachbit/trunk/debian/patches/no_X	2009-04-19 12:58:25 UTC (rev 2768)
+++ packages/bleachbit/trunk/debian/patches/no_X	2009-04-19 13:00:24 UTC (rev 2769)
@@ -1,40 +0,0 @@
-Do not show intrusive pyGTK warnings if X is not available.
-http://bugs.debian.org/520107
-https://launchpad.net/bugs/344320
-
-Index: bleachbit-0.4.0/bleachbit/GUI.py
-===================================================================
---- bleachbit-0.4.0.orig/bleachbit/GUI.py	2009-04-06 11:49:12.000000000 +0200
-+++ bleachbit-0.4.0/bleachbit/GUI.py	2009-04-06 11:52:59.000000000 +0200
-@@ -20,14 +20,18 @@
- 
- 
- from gettext import gettext as _
--import pygtk
--pygtk.require('2.0')
--import gtk
--import gobject
- import os
- import sys
- import threading
- import traceback
-+import warnings
-+
-+warnings.simplefilter('error')
-+import pygtk
-+pygtk.require('2.0')
-+import gtk
-+import gobject
-+warnings.simplefilter('default')
- 
- import FileUtilities
- import Update
-@@ -695,6 +699,8 @@
-             gobject.idle_add(self.enable_online_update, update.get_update_info_url())
- 
-     def __init__(self):
-+        if None == os.getenv('DISPLAY'):
-+            sys.exit(_('Bleachbit requires a graphical display'))
-         import RecognizeCleanerML
-         rcml = RecognizeCleanerML.RecognizeCleanerML()
-         import CleanerML

Modified: packages/bleachbit/trunk/debian/patches/series
===================================================================
--- packages/bleachbit/trunk/debian/patches/series	2009-04-19 12:58:25 UTC (rev 2768)
+++ packages/bleachbit/trunk/debian/patches/series	2009-04-19 13:00:24 UTC (rev 2769)
@@ -1,6 +1,4 @@
 desktop_file
 no_update
 launcher
-LANG_env
-no_X
 suppress_locales_warnings