[Python-apps-commits] r10928 - in packages/bleachbit/trunk/debian (5 files)

[dktrkranz at users.alioth.debian.org]

    Date: Wednesday, June 11, 2014 @ 11:04:18
  Author: dktrkranz
Revision: 10928

Refresh patches for new upstream release

Modified:
  packages/bleachbit/trunk/debian/changelog
  packages/bleachbit/trunk/debian/patches/desktop_file.patch
  packages/bleachbit/trunk/debian/patches/gnomevfs.patch
  packages/bleachbit/trunk/debian/patches/local_cleaners_dir.patch
  packages/bleachbit/trunk/debian/patches/no_update.patch

Modified: packages/bleachbit/trunk/debian/changelog
===================================================================
--- packages/bleachbit/trunk/debian/changelog	2014-06-11 10:46:23 UTC (rev 10927)
+++ packages/bleachbit/trunk/debian/changelog	2014-06-11 11:04:18 UTC (rev 10928)
@@ -1,6 +1,8 @@
 bleachbit (1.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches/*.patch:
+    - Refresh for new upstream release.
   * debian/copyright:
     - Update copyright years.
 

Modified: packages/bleachbit/trunk/debian/patches/desktop_file.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/desktop_file.patch	2014-06-11 10:46:23 UTC (rev 10927)
+++ packages/bleachbit/trunk/debian/patches/desktop_file.patch	2014-06-11 11:04:18 UTC (rev 10928)
@@ -2,11 +2,11 @@
 Origin: Debian
 Forwarded: not-needed
 
-Index: bleachbit-0.7.4/bleachbit.desktop
+Index: bleachbit-1.2/bleachbit.desktop
 ===================================================================
---- bleachbit-0.7.4.orig/bleachbit.desktop	2009-11-10 22:39:33.581078600 +0100
-+++ bleachbit-0.7.4/bleachbit.desktop	2009-11-10 22:42:57.329068306 +0100
-@@ -97,6 +97,5 @@
+--- bleachbit-1.2.orig/bleachbit.desktop
++++ bleachbit-1.2/bleachbit.desktop
+@@ -99,6 +99,5 @@ TryExec=bleachbit
  Exec=bleachbit
  Icon=bleachbit
  Categories=GTK;System;

Modified: packages/bleachbit/trunk/debian/patches/gnomevfs.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/gnomevfs.patch	2014-06-11 10:46:23 UTC (rev 10927)
+++ packages/bleachbit/trunk/debian/patches/gnomevfs.patch	2014-06-11 11:04:18 UTC (rev 10928)
@@ -3,11 +3,11 @@
 Bug-Debian: http://bugs.debian.org/605555
 Forwarded: https://launchpad.net/bugs/708898
 
-Index: bleachbit-0.8.8/bleachbit/Unix.py
+Index: bleachbit-1.2/bleachbit/Unix.py
 ===================================================================
---- bleachbit-0.8.8.orig/bleachbit/Unix.py	2011-01-27 23:18:08.071852091 +0100
-+++ bleachbit-0.8.8/bleachbit/Unix.py	2011-01-27 23:20:04.531129734 +0100
-@@ -36,18 +36,11 @@
+--- bleachbit-1.2.orig/bleachbit/Unix.py
++++ bleachbit-1.2/bleachbit/Unix.py
+@@ -35,18 +35,11 @@ from Common import _, autostart_path, la
  import FileUtilities
  import General
  
@@ -27,9 +27,9 @@
 -
 +    HAVE_GIO = False
  
- 
- def guess_overwrite_paths():
-@@ -482,7 +482,7 @@
+ def locale_to_language(locale):
+     """Convert the locale code to a language code (generally ISO 639)"""
+@@ -492,7 +485,7 @@ def is_broken_xdg_desktop(pathname):
              print "info: is_broken_xdg_menu: missing required option 'MimeType': '%s'" % (pathname)
              return True
          mimetype = config.get('Desktop Entry', 'MimeType').strip().lower()

Modified: packages/bleachbit/trunk/debian/patches/local_cleaners_dir.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/local_cleaners_dir.patch	2014-06-11 10:46:23 UTC (rev 10927)
+++ packages/bleachbit/trunk/debian/patches/local_cleaners_dir.patch	2014-06-11 11:04:18 UTC (rev 10928)
@@ -3,16 +3,17 @@
 Bug-Debian: http://bugs.debian.org/565359
 Forwarded: not-needed
 
-Index: bleachbit-0.7.4/bleachbit/Common.py
+Index: bleachbit-1.2/bleachbit/Common.py
 ===================================================================
---- bleachbit-0.7.4.orig/bleachbit/Common.py	2010-01-24 21:09:13.798194540 +0100
-+++ bleachbit-0.7.4/bleachbit/Common.py	2010-01-24 21:09:09.158190122 +0100
-@@ -98,7 +98,7 @@
-     system_cleaners_dir = '/usr/pkg/share/bleachbit/cleaners'
+--- bleachbit-1.2.orig/bleachbit/Common.py
++++ bleachbit-1.2/bleachbit/Common.py
+@@ -105,8 +105,7 @@ else:
+     print 'warning: unknown system cleaners directory for platform ', sys.platform
  
  # local cleaners directory (for running from source tree)
--local_cleaners_dir =  os.path.normpath(os.path.join(bleachbit_exe_path, '../cleaners'))
+-local_cleaners_dir = os.path.normpath(
+-    os.path.join(bleachbit_exe_path, '../cleaners'))
 +local_cleaners_dir =  os.path.normpath(personal_cleaners_dir)
  
  # application icon
- __icons = ( '/usr/share/pixmaps/bleachbit.png', # Linux
+ __icons = ('/usr/share/pixmaps/bleachbit.png',  # Linux

Modified: packages/bleachbit/trunk/debian/patches/no_update.patch
===================================================================
--- packages/bleachbit/trunk/debian/patches/no_update.patch	2014-06-11 10:46:23 UTC (rev 10927)
+++ packages/bleachbit/trunk/debian/patches/no_update.patch	2014-06-11 11:04:18 UTC (rev 10928)
@@ -2,16 +2,16 @@
 Origin: Debian
 Forwarded: not-needed
 
-Index: bleachbit-0.7.4/bleachbit/Common.py
+Index: bleachbit-1.2/bleachbit/Common.py
 ===================================================================
---- bleachbit-0.7.4.orig/bleachbit/Common.py	2009-11-10 22:39:33.141073245 +0100
-+++ bleachbit-0.7.4/bleachbit/Common.py	2009-11-10 22:43:22.609075670 +0100
-@@ -41,7 +41,7 @@
+--- bleachbit-1.2.orig/bleachbit/Common.py
++++ bleachbit-1.2/bleachbit/Common.py
+@@ -41,7 +41,7 @@ socket_timeout = 10
  
  # Setting below value to false disables update notification (useful
  # for packages in repositories).
 -online_update_notification_enabled = True
 +online_update_notification_enabled = False
  
- ###
- ### Paths
+ #
+ # Paths