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

[dktrkranz at users.alioth.debian.org]

    Date: Monday, August 20, 2012 @ 20:56:05
  Author: dktrkranz
Revision: 9041

Remove debian/patches/no_X.patch, applied upstream

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

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2012-08-20 20:51:56 UTC (rev 9040)
+++ packages/bleachbit/trunk/debian/changelog	2012-08-20 20:56:05 UTC (rev 9041)
@@ -1,6 +1,8 @@
 bleachbit (0.9.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/no_X.patch:
+    - Removed, applied upstream.
 
  -- Luca Falavigna <dktrkranz at debian.org>  Mon, 20 Aug 2012 22:51:23 +0200
 

Deleted: packages/bleachbit/trunk/debian/patches/no_X.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/no_X.patch	2012-08-20 20:51:56 UTC (rev 9040)
+++ packages/bleachbit/trunk/debian/patches/no_X.patch	2012-08-20 20:56:05 UTC (rev 9041)
@@ -1,20 +0,0 @@
-Description: Do not try to launch GUI if X is not available
-Author: Luca Falavigna <dktrkranz at debian.org>
-Forwarded: https://launchpad.net/bugs/1004923
-
-Index: bleachbit-0.9.2/bleachbit.py
-===================================================================
---- bleachbit-0.9.2.orig/bleachbit.py	2012-03-15 04:24:51.000000000 +0100
-+++ bleachbit-0.9.2/bleachbit.py	2012-05-26 18:16:40.679476296 +0200
-@@ -39,6 +39,11 @@
- 
- if 1 == len(sys.argv):
-     import gtk
-+    try:
-+        gtk.gdk.Screen().get_display()
-+    except RuntimeError:
-+        print "Could not open X display"
-+        sys.exit(1)
-     import bleachbit.GUI
-     gui = bleachbit.GUI.GUI()
-     gtk.main()

Modified: packages/bleachbit/trunk/debian/patches/series
===================================================================
--- packages/bleachbit/trunk/debian/patches/series	2012-08-20 20:51:56 UTC (rev 9040)
+++ packages/bleachbit/trunk/debian/patches/series	2012-08-20 20:56:05 UTC (rev 9041)
@@ -2,4 +2,3 @@
 no_update.patch
 local_cleaners_dir.patch
 gnomevfs.patch
-no_X.patch