[Pkg-xfce-commits] r2563 - in desktop/branches/svn-snapshots/xfce4-session/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-11-28 07:14:27 +0000 (Fri, 28 Nov 2008)
New Revision: 2563

Added:
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_fix-suspend-errors-at-resume.patch
Modified:
   desktop/branches/svn-snapshots/xfce4-session/debian/changelog
   desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
   desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides
Log:
* debian/patches:
  - 03_fix-suspend-errors-at-resume added, fix errors when resuming.
* debian/xfce4-session.lintian-overrides:
  - update link for beta2.

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-11-25 19:32:46 UTC (rev 2562)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/changelog	2008-11-28 07:14:27 UTC (rev 2563)
@@ -38,8 +38,12 @@
   * debian/xfce4-session.xml:
     - now that simple engine configuration is handled is xfconf, provide a
       desktop-base config file.
+  * debian/patches:
+    - 03_fix-suspend-errors-at-resume added, fix errors when resuming.
+  * debian/xfce4-session.lintian-overrides:
+    - update link for beta2.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 15 Nov 2008 00:34:47 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 28 Nov 2008 07:50:13 +0100
 
 xfce4-session (4.4.2-6) unstable; urgency=low
 

Added: desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_fix-suspend-errors-at-resume.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_fix-suspend-errors-at-resume.patch	                        (rev 0)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/03_fix-suspend-errors-at-resume.patch	2008-11-28 07:14:27 UTC (rev 2563)
@@ -0,0 +1,22 @@
+commit 22cbdfe0b421fba849fa6bb9661e585fda0f5c58
+Author: kelnos <kelnos at a0aa69c2-05f4-0310-b83c-d5d913b14636>
+Date:   Fri Nov 28 06:14:37 2008 +0000
+
+    	* xfce4-session/xfsm-manager.c: On suspend/hibernate, ignore errors
+    	  of type DBUS_GERROR_NO_REPLY, not type _TIMEOUT (bug 4628).
+    
+    git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-session/trunk@28938 a0aa69c2-05f4-0310-b83c-d5d913b14636
+
+diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
+index e2f05d9..7bc81f2 100644
+--- a/xfce4-session/xfsm-manager.c
++++ b/xfce4-session/xfsm-manager.c
+@@ -1104,7 +1104,7 @@ xfsm_manager_save_yourself_global (XfsmManager     *manager,
+                                                     manager->shutdown_type,
+                                                     &error)
+                   && (error->domain != DBUS_GERROR
+-                      || error->code != DBUS_GERROR_TIMED_OUT)))
++                      || error->code != DBUS_GERROR_NO_REPLY)))
+             {
+               xfce_message_dialog (NULL, _("Shutdown Failed"),
+                                    GTK_STOCK_DIALOG_ERROR,

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-11-25 19:32:46 UTC (rev 2562)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/series	2008-11-28 07:14:27 UTC (rev 2563)
@@ -1,2 +1,3 @@
 01_correct_shadows.patch
 02_xfce4-session-logout-manpage-typo.patch
+03_fix-suspend-errors-at-resume.patch

Modified: desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides	2008-11-25 19:32:46 UTC (rev 2562)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.lintian-overrides	2008-11-28 07:14:27 UTC (rev 2563)
@@ -1,4 +1,4 @@
-xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/libxfsm-4.6.so.0.0.1 usr/lib/libxfsm-4.6.so
+xfce4-session: non-dev-pkg-with-shlib-symlink usr/lib/libxfsm-4.6.so.0.0.0 usr/lib/libxfsm-4.6.so
 xfce4-session: package-name-doesnt-match-sonames libxfsm-4.6-0
 # These are all private
 xfce4-session: binary-without-manpage usr/sbin/balou-export-theme