r20493 - in /desktop/unstable/sabayon/debian: README.Debian changelog patches/03_file_monitor.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Jun 28 11:35:33 2009
New Revision: 20493

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20493
Log:
* 03_file_monitor.patch: stolen upstream. Make file monitoring 
  working.
* Remove the panel delegate since it is completely broken and entirely 
  prevents Sabayon from working. Document this in README.Debian.

Added:
    desktop/unstable/sabayon/debian/README.Debian
    desktop/unstable/sabayon/debian/patches/03_file_monitor.patch
Modified:
    desktop/unstable/sabayon/debian/changelog
    desktop/unstable/sabayon/debian/rules

Added: desktop/unstable/sabayon/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/README.Debian?rev=20493&op=file
==============================================================================
--- desktop/unstable/sabayon/debian/README.Debian (added)
+++ desktop/unstable/sabayon/debian/README.Debian Sun Jun 28 11:35:33 2009
@@ -1,0 +1,6 @@
+Sabayon for Debian
+==================
+
+The panel setup helper is broken and prevents sabayon from working. 
+Therefore, it has been disabled in the Debian packages. Sabayon will not 
+record panel-related profile changes.

Modified: desktop/unstable/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/changelog?rev=20493&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/changelog (original)
+++ desktop/unstable/sabayon/debian/changelog Sun Jun 28 11:35:33 2009
@@ -37,6 +37,10 @@
   * Force XNEST_PATH to Xephyr. Use xserver-xephyr instead of xnest.
   * 02_environ_crash.patch: new patch. Fix a crash when there is no 
     XAUTHLOCALHOSTNAME set.
+  * 03_file_monitor.patch: stolen upstream. Make file monitoring 
+    working.
+  * Remove the panel delegate since it is completely broken and entirely 
+    prevents Sabayon from working. Document this in README.Debian.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 27 Jun 2009 18:30:30 +0200
 

Added: desktop/unstable/sabayon/debian/patches/03_file_monitor.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/patches/03_file_monitor.patch?rev=20493&op=file
==============================================================================
--- desktop/unstable/sabayon/debian/patches/03_file_monitor.patch (added)
+++ desktop/unstable/sabayon/debian/patches/03_file_monitor.patch Sun Jun 28 11:35:33 2009
@@ -1,0 +1,60 @@
+From e3053819d00ed012350ec66bfcac6b175d40dec1 Mon Sep 17 00:00:00 2001
+From: Federico Mena Quintero <federico at novell.com>
+Date: Tue, 14 Apr 2009 19:12:59 +0000
+Subject: bgo#542604 - fix file monitoring due to incorrect callback prototype
+
+Signed-off-by: Federico Mena Quintero <federico at novell.com>
+
+svn path=/trunk/; revision=1101
+---
+diff --git a/ChangeLog b/ChangeLog
+index 7f6bfef..9416fc6 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2009-04-14  Sayamindu Dasgupta  <sayamindu at gmail.com>
++
++	* lib/dirmonitor.py
++	(DirectoryMonitor.__handle_file_monitor_event): Fix incorrect
++	callback prototype.  This was keeping file monitoring from
++	working!  Fixes http://bugzilla.gnome.org/show_bug.cgi?id=542604
++
+ ==================== 2.25.0 ====================
+ 
+ 2009-03-11  Federico Mena Quintero  <federico at novell.com>
+diff --git a/lib/dirmonitor.py b/lib/dirmonitor.py
+index 2962606..c1a4253 100755
+--- a/lib/dirmonitor.py
++++ b/lib/dirmonitor.py
+@@ -77,22 +77,22 @@ class DirectoryMonitor:
+     #
+     # Processing of a file_monitor callback
+     #
+-    def __handle_file_monitor_event (self, dir_uri, file_uri, event, data):
+-        if event == CHANGED or event == DELETED or event == CREATED:
+-            path = file_uri.get_path ()
++    def __handle_file_monitor_event (self, monitor, file, other_file, event_type):
++        if event_type == CHANGED or event_type == DELETED or event_type == CREATED:
++            path = file.get_path ()
+             
+             # Strip trailing '/'.
+             path = os.path.normpath (path)
+             
+-            dprint ("Got file_monitor event '%s' on '%s'", event_to_string (event), path)
++            dprint ("Got file_monitor event '%s' on '%s'", event_to_string (event_type), path)
+ 
+             if not self.__should_ignore_dir (path) and \
+                not self.__should_ignore_file (path):
+-                self.__invoke_callback (path, event)
++                self.__invoke_callback (path, event_type)
+ 
+-                if event == CREATED and os.path.isdir (path):
++                if event_type == CREATED and os.path.isdir (path):
+                     self.__monitor_dir_recurse (path, True)
+-                elif event == DELETED:
++                elif event_type == DELETED:
+                     if path != self.directory and self.watches.has_key (path):
+                         dprint ("Deleting watch for '%s' since it got deleted", path)
+                         self.watches [path].cancel ()
+--
+cgit v0.8.2

Modified: desktop/unstable/sabayon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/rules?rev=20493&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/rules (original)
+++ desktop/unstable/sabayon/debian/rules Sun Jun 28 11:35:33 2009
@@ -16,5 +16,5 @@
 binary-install/sabayon::
 	find debian/sabayon -name '*.a' -exec rm -f '{}' \;
 	find debian/sabayon -name '*.la' -exec rm -f '{}' \;
+	find debian/sabayon -name paneldelegate.py -exec rm -f '{}' \;
 	dh_pysupport
-