[Pkg-xfce-commits] r5940 - in desktop/branches/experimental/xfce4-session/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2011-08-18 12:05:10 +0000 (Thu, 18 Aug 2011)
New Revision: 5940

Added:
   desktop/branches/experimental/xfce4-session/debian/patches/06_no-settings-helper-in-490.patch
Modified:
   desktop/branches/experimental/xfce4-session/debian/changelog
   desktop/branches/experimental/xfce4-session/debian/patches/series
Log:
* debian/patches:
  - 05_force-xfsettingsd-start.patch: updated for xfce4-settings 4.9.0
    ('--force' has been changed to '--replace').
  - 06_no-settings-helper-in-490.patch: added, do not launch x-s-h.
  - series: refreshed.

Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog	2011-08-18 11:50:56 UTC (rev 5939)
+++ desktop/branches/experimental/xfce4-session/debian/changelog	2011-08-18 12:05:10 UTC (rev 5940)
@@ -6,8 +6,11 @@
     - fix path for xfsm-shutdown-helper.                        closes: #637197
 
   [ Lionel Le Folgoc ]
-  * debian/patches/05_force-xfsettingsd-start.patch: updated for xfce4-settings
-    4.9.0 ('--force' has been changed to '--replace').
+  * debian/patches:
+    - 05_force-xfsettingsd-start.patch: updated for xfce4-settings 4.9.0
+      ('--force' has been changed to '--replace').
+    - 06_no-settings-helper-in-490.patch: added, do not launch x-s-h.
+    - series: refreshed.
   * debian/control: bump xfce4-settings' dep to >= 4.9.0.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Aug 2011 13:59:29 +0200

Added: desktop/branches/experimental/xfce4-session/debian/patches/06_no-settings-helper-in-490.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/06_no-settings-helper-in-490.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-session/debian/patches/06_no-settings-helper-in-490.patch	2011-08-18 12:05:10 UTC (rev 5940)
@@ -0,0 +1,22 @@
+--- xfce4-session-4.8.1/settings/xfce4-session.xml	2010-09-08 18:37:19.000000000 +0200
++++ xfce4-session-4.8.1/settings/xfce4-session.xml.new	2011-08-18 13:57:27.000000000 +0200
+@@ -7,7 +7,7 @@
+   <property name="sessions" type="empty">
+     <property name="Failsafe" type="empty">
+       <property name="IsFailsafe" type="bool" value="true"/>
+-      <property name="Count" type="int" value="5"/>
++      <property name="Count" type="int" value="4"/>
+       <property name="Client0_Command" type="array">
+         <value type="string" value="xfwm4"/>
+       </property>
+@@ -25,10 +25,6 @@
+         <value type="string" value="xfdesktop"/>
+       </property>
+       <property name="Client3_PerScreen" type="bool" value="false"/>
+-      <property name="Client4_Command" type="array">
+-        <value type="string" value="xfce4-settings-helper"/>
+-      </property>
+-      <property name="Client4_PerScreen" type="bool" value="false"/>
+     </property>
+   </property>
+   <property name="splash" type="empty">

Modified: desktop/branches/experimental/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/series	2011-08-18 11:50:56 UTC (rev 5939)
+++ desktop/branches/experimental/xfce4-session/debian/patches/series	2011-08-18 12:05:10 UTC (rev 5940)
@@ -2,3 +2,4 @@
 02_fix-fortune-path.patch
 03_dont-die-on-dbus-disconnect.patch
 05_force-xfsettingsd-start.patch
+06_no-settings-helper-in-490.patch