r20193 - in /desktop/unstable/gnome-session/debian: changelog control control.in gconf-defaults

[joss at users.alioth.debian.org]

Author: joss
Date: Sun May 31 12:30:29 2009
New Revision: 20193

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20193
Log:
* gconf-defaults: remove the file manager from the required components 
  list. Now that nautilus has an autostart file, this is no longer 
  necessary. It avoids restarting it endlessly when this is not 
  required. Closes: #525718.
* Break nautilus << 2.26.2-4 to ensure the autostart file is here.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/control
    desktop/unstable/gnome-session/debian/control.in
    desktop/unstable/gnome-session/debian/gconf-defaults

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=20193&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Sun May 31 12:30:29 2009
@@ -1,3 +1,13 @@
+gnome-session (2.26.1-4) unstable; urgency=low
+
+  * gconf-defaults: remove the file manager from the required components 
+    list. Now that nautilus has an autostart file, this is no longer 
+    necessary. It avoids restarting it endlessly when this is not 
+    required. Closes: #525718.
+  * Break nautilus << 2.26.2-4 to ensure the autostart file is here.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 31 May 2009 14:04:06 +0200
+
 gnome-session (2.26.1-3) unstable; urgency=low
 
   * Stop mentioning GNOME 2.

Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=20193&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control (original)
+++ desktop/unstable/gnome-session/debian/control Sun May 31 12:30:29 2009
@@ -42,7 +42,8 @@
 Conflicts: bug-buddy (<< 2.20),
            libgnomevfs2-common (<< 1:2.24.0-3)
 Breaks: gnome-panel (<< 2.26),
-        xserver-xorg (<< 1:7.4)
+        xserver-xorg (<< 1:7.4),
+        nautilus (<< 2.26.2-4)
 Provides: x-session-manager
 Suggests: gnome-user-guide | gnome2-user-guide,
           desktop-base,

Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=20193&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in (original)
+++ desktop/unstable/gnome-session/debian/control.in Sun May 31 12:30:29 2009
@@ -42,7 +42,8 @@
 Conflicts: bug-buddy (<< 2.20),
            libgnomevfs2-common (<< 1:2.24.0-3)
 Breaks: gnome-panel (<< 2.26),
-        xserver-xorg (<< 1:7.4)
+        xserver-xorg (<< 1:7.4),
+        nautilus (<< 2.26.2-4)
 Provides: x-session-manager
 Suggests: gnome-user-guide | gnome2-user-guide,
           desktop-base,

Modified: desktop/unstable/gnome-session/debian/gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gconf-defaults?rev=20193&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gconf-defaults (original)
+++ desktop/unstable/gnome-session/debian/gconf-defaults Sun May 31 12:30:29 2009
@@ -1,1 +1,2 @@
 /apps/gnome-session/options/show_splash_screen false
+/desktop/gnome/session/required_components_list [windowmanager,panel]