r27709 - in /desktop/experimental/gnome-session/debian: ./ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Apr 20 21:12:57 UTC 2011


Author: joss
Date: Wed Apr 20 21:12:55 2011
New Revision: 27709

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27709
Log:
* New usptream release.
* Remove disabled patches.
* 10_session_save.patch: updated for the new version.
* 11_saved_session_name.patch: dropped, we won’t be needing it with 
  the way session saving is handled in 3.0.
* Pull back gnome-wm and gnome-wm.desktop, it’s the easiest way to 
  configure the window manager for the fallback session.
* 01_gnome-wm.patch: new patch. Make gnome-wm the default instead of 
  metacity.
* 02_fallback_desktop.patch: new patch. Build a gnome-fallback.desktop 
  for /usr/share/xsessions.
* 13_no_fallback_notification.patch: refreshed accordingly.
* Move gsettings-desktop-schemas dependency to gnome-session-bin.
* gnome-session.postinst: drop removal of obsolete alternative, it’s 
  in stable now.
* Split gnome-session again. Put common files in gnome-session-common, 
  the standard session in gnome-session and the fallback session in 
  gnome-session-fallback.
* Sort out the resulting Conflicts/Replaces/Provides nightmare.
* Move back the defaults.list to gnome-session-common.
* Massive updates for short/long descriptions.
* Document how sessions are launched in README.Debian.

Added:
    desktop/experimental/gnome-session/debian/gnome-session-common.dirs
      - copied unchanged from r27616, desktop/experimental/gnome-session/debian/gnome-session.dirs
    desktop/experimental/gnome-session/debian/gnome-session-common.install
    desktop/experimental/gnome-session/debian/gnome-session-common.links
      - copied unchanged from r27616, desktop/experimental/gnome-session/debian/gnome-session.links
    desktop/experimental/gnome-session/debian/gnome-session-fallback.install
    desktop/experimental/gnome-session/debian/gnome-wm   (with props)
    desktop/experimental/gnome-session/debian/gnome-wm.desktop
    desktop/experimental/gnome-session/debian/patches/01_gnome-wm.patch
    desktop/experimental/gnome-session/debian/patches/02_fallback_desktop.patch
Removed:
    desktop/experimental/gnome-session/debian/gnome-session.dirs
    desktop/experimental/gnome-session/debian/gnome-session.links
    desktop/experimental/gnome-session/debian/patches/02_no_warning_crash.patch
    desktop/experimental/gnome-session/debian/patches/03_upower.patch
    desktop/experimental/gnome-session/debian/patches/11_saved_session_name.patch
    desktop/experimental/gnome-session/debian/patches/90_relibtoolize.patch
Modified:
    desktop/experimental/gnome-session/debian/README.Debian
    desktop/experimental/gnome-session/debian/changelog
    desktop/experimental/gnome-session/debian/control
    desktop/experimental/gnome-session/debian/control.in
    desktop/experimental/gnome-session/debian/gnome-session-bin.install
    desktop/experimental/gnome-session/debian/gnome-session.install
    desktop/experimental/gnome-session/debian/gnome-session.postinst
    desktop/experimental/gnome-session/debian/patches/10_session_save.patch
    desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch
    desktop/experimental/gnome-session/debian/patches/series

Modified: desktop/experimental/gnome-session/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/README.Debian?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/README.Debian [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/README.Debian [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,5 +1,30 @@
 gnome-session for Debian
 ========================
+
+GNOME 3 / GNOME Fallback
+------------------------
+
+The gnome-session package provides the standard GNOME 3 session, which 
+is based on the GNOME Shell. The gnome-session-fallback package provides 
+a “fallback” session which is based on the GNOME panel and Metacity. You 
+can choose them in the display manager (typically GDM).
+
+If no suitable 3D acceleration is detected, the fallback session will be 
+launched in both cases.
+
+
+Changing the window manager
+---------------------------
+
+The GNOME Shell requires mutter and cannot run with another window 
+manager.
+
+If you want to use an alternative window manager (such as compiz or 
+openbox), you need to select the fallback session. Then, put in your 
+.gnomerc file the following:
+    WINDOW_MANAGER=my_wonderful_wm
+    export WINDOW_MANAGER
+
 
 Applications at startup
 -----------------------
@@ -15,12 +40,8 @@
    manager. They can be selectively disabled in the configuration 
    applet.
  - Required components: they are listed in the 
-   /desktop/gnome/session/required_components_list GConf key. This 
-   includes the window manager, the panel and the file manager.
-   The required components are always respawned if they crash or exit. 
-   To disable them, you need to change this GConf key. If you want to 
-   use an alternate panel or window manager, you need to change the 
-   corresponding key in /desktop/gnome/session/required_components/.
+   /usr/share/gnome-session/sessions/*.desktop file corresponding to the 
+   current session (gnome or gnome-fallback).
 
 
 Splash screen
@@ -28,16 +49,3 @@
 
 Displaying a splash screen implies a noticeable delay in login for most users,
 hence it's entirely disabled now.
-
-
-Changing the window manager
----------------------------
-
-For GNOME 2, gnome-session tries to start metacity, mutter or sawfish if 
-they are installed, then falls back to the system default.
-
-If you want to specify the window manager by hand, you can set the 
-/desktop/gnome/session/required_components/windowmanager GConf key to 
-the value of your preferred one.
-
-For GNOME 3, it starts gnome-shell instead.

Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/changelog [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,9 +1,31 @@
-gnome-session (2.91.93-2) UNRELEASED; urgency=low
+gnome-session (3.0.0-1) experimental; urgency=low
 
   * debian/rules: remove the libexecdir setting, let the cdbs default be 
     used instead.
-
- -- Josselin Mouette <joss at debian.org>  Mon, 28 Mar 2011 15:24:08 +0530
+  * New usptream release.
+  * Remove disabled patches.
+  * 10_session_save.patch: updated for the new version.
+  * 11_saved_session_name.patch: dropped, we won’t be needing it with 
+    the way session saving is handled in 3.0.
+  * Pull back gnome-wm and gnome-wm.desktop, it’s the easiest way to 
+    configure the window manager for the fallback session.
+  * 01_gnome-wm.patch: new patch. Make gnome-wm the default instead of 
+    metacity.
+  * 02_fallback_desktop.patch: new patch. Build a gnome-fallback.desktop 
+    for /usr/share/xsessions.
+  * 13_no_fallback_notification.patch: refreshed accordingly.
+  * Move gsettings-desktop-schemas dependency to gnome-session-bin.
+  * gnome-session.postinst: drop removal of obsolete alternative, it’s 
+    in stable now.
+  * Split gnome-session again. Put common files in gnome-session-common, 
+    the standard session in gnome-session and the fallback session in 
+    gnome-session-fallback.
+  * Sort out the resulting Conflicts/Replaces/Provides nightmare.
+  * Move back the defaults.list to gnome-session-common.
+  * Massive updates for short/long descriptions.
+  * Document how sessions are launched in README.Debian.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 20 Apr 2011 23:08:49 +0200
 
 gnome-session (2.91.93-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control [utf-8] Wed Apr 20 21:12:55 2011
@@ -36,50 +36,94 @@
 Package: gnome-session
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-settings-daemon,
-         gnome-shell,
-         nautilus (>= 2.26),
+         gnome-settings-daemon (>= 3.0),
+         gnome-shell (>= 3.0),
          policykit-1-gnome,
-         gnome-panel (>= 2.26),
-         metacity,
-         nautilus (>= 2.26),
-         notification-daemon,
-         gsettings-desktop-schemas,
          gnome-session-bin (>= ${binary:Version}),
-         gnome-session-bin (<< ${gnome:NextVersion})
-Recommends: gnome-session-fallback, gnome-power-manager (>= 2.28)
-Replaces: gnome-session-common (<< 2.91.91.3-1),
+         gnome-session-bin (<< ${gnome:NextVersion}),
+         gnome-session-common (= ${binary:Version})
+Recommends: gnome-session-fallback,
+            gnome-power-manager,
+            notification-daemon
+Suggests: gnome-user-guide,
+          desktop-base,
+          gnome-keyring
+Replaces: gnome-session-bin (<< 3.0),
           gnome3-session
 Breaks: bug-buddy (<< 2.20),
         xserver-xorg (<< 1:7.4),
-        gnome-power-manager (<< 2.28),
-        gnome-session-common (<< 2.91.91.3-1)
-Conflicts: gnome-splashscreen-manager,
-           gnome3-session
+        gnome-power-manager (<< 2.28)
+Conflicts: gnome3-session
 Provides: x-session-manager,
           gnome3-session
+Description: GNOME Session Manager - GNOME 3 session
+ The GNOME Session Manager is in charge of starting the core components 
+ of the GNOME desktop, and applications that should be launched at 
+ login time. It also features a way to save and restore currently 
+ running applications.
+ .
+ This package contains the required components for the standard GNOME 3 
+ session, based on the GNOME Shell. It can be started from a display 
+ manager such as GDM, and requires 3D acceleration to work properly.
+
+Package: gnome-session-fallback
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-settings-daemon (>= 3.0),
+         gnome-panel (>= 3.0),
+         metacity (>= 2.30),
+         policykit-1-gnome,
+         gnome-session-bin (>= ${binary:Version}),
+         gnome-session-bin (<< ${gnome:NextVersion}),
+         gnome-session-common (= ${binary:Version})
+Recommends: gnome-power-manager,
+            notification-daemon
 Suggests: gnome-user-guide,
           desktop-base,
           gnome-keyring
-Description: The GNOME Session Manager - GNOME 3 session
- This package contains a session that can be started from a display
- manager such as GDM. It will load all necessary applications for a
- full-featured user session.
+Replaces: gnome-session (<< 3.0),
+          gnome-session-bin (<< 3.0)
+Provides: x-session-manager
+Description: GNOME Session Manager - GNOME fallback session
+ The GNOME Session Manager is in charge of starting the core components 
+ of the GNOME desktop, and applications that should be launched at 
+ login time. It also features a way to save and restore currently 
+ running applications.
  .
- The session manager also features the ability to save a running session
- an restore it later.
+ This package contains the required components for the GNOME 3 fallback
+ session, based on the GNOME Panel. It can be started from a display 
+ manager such as GDM, and doesn’t have specific hardware requirements.
 
 Package: gnome-session-bin
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          dbus-x11,
+         gsettings-desktop-schemas,
          upower (>= 0.9.0)
 Conflicts: gnome-session (<< 2.26.1-5)
-Replaces: gnome-session-common (<< 2.91.91.3-1)
-Description: The GNOME Session Manager - Minimal runtime
+Description: GNOME Session Manager - Minimal runtime
+ The GNOME Session Manager is in charge of starting the core components 
+ of the GNOME desktop, and applications that should be launched at 
+ login time. It also features a way to save and restore currently 
+ running applications.
+ .
  This package contains the binaries for the GNOME Session Manager, but
  no startup scripts. It is meant for those willing to start
  gnome-session by hand with the components of their choice, and for
  applications such as GDM that use gnome-session internally.
 
+Package: gnome-session-common
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: gnome-session (<< 3.0),
+          gnome-session-bin (<< 3.0),
+          libgnomevfs2-common (<< 1:2.24.0-3)
+Description: GNOME Session Manager - common files
+ The GNOME Session Manager is in charge of starting the core components 
+ of the GNOME desktop, and applications that should be launched at 
+ login time. It also features a way to save and restore currently 
+ running applications.
+ .
+ This package contains the translations, data files and startup scripts 
+ which are common to the GNOME and GNOME fallback sessions.

Modified: desktop/experimental/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control.in?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control.in [utf-8] Wed Apr 20 21:12:55 2011
@@ -31,50 +31,94 @@
 Package: gnome-session
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-settings-daemon,
-         gnome-shell,
-         nautilus (>= 2.26),
+         gnome-settings-daemon (>= 3.0),
+         gnome-shell (>= 3.0),
          policykit-1-gnome,
-         gnome-panel (>= 2.26),
-         metacity,
-         nautilus (>= 2.26),
-         notification-daemon,
-         gsettings-desktop-schemas,
          gnome-session-bin (>= ${binary:Version}),
-         gnome-session-bin (<< ${gnome:NextVersion})
-Recommends: gnome-session-fallback, gnome-power-manager (>= 2.28)
-Replaces: gnome-session-common (<< 2.91.91.3-1),
+         gnome-session-bin (<< ${gnome:NextVersion}),
+         gnome-session-common (= ${binary:Version})
+Recommends: gnome-session-fallback,
+            gnome-power-manager,
+            notification-daemon
+Suggests: gnome-user-guide,
+          desktop-base,
+          gnome-keyring
+Replaces: gnome-session-bin (<< 3.0),
           gnome3-session
 Breaks: bug-buddy (<< 2.20),
         xserver-xorg (<< 1:7.4),
-        gnome-power-manager (<< 2.28),
-        gnome-session-common (<< 2.91.91.3-1)
-Conflicts: gnome-splashscreen-manager,
-           gnome3-session
+        gnome-power-manager (<< 2.28)
+Conflicts: gnome3-session
 Provides: x-session-manager,
           gnome3-session
+Description: GNOME Session Manager - GNOME 3 session
+ The GNOME Session Manager is in charge of starting the core components 
+ of the GNOME desktop, and applications that should be launched at 
+ login time. It also features a way to save and restore currently 
+ running applications.
+ .
+ This package contains the required components for the standard GNOME 3 
+ session, based on the GNOME Shell. It can be started from a display 
+ manager such as GDM, and requires 3D acceleration to work properly.
+
+Package: gnome-session-fallback
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-settings-daemon (>= 3.0),
+         gnome-panel (>= 3.0),
+         metacity (>= 2.30),
+         policykit-1-gnome,
+         gnome-session-bin (>= ${binary:Version}),
+         gnome-session-bin (<< ${gnome:NextVersion}),
+         gnome-session-common (= ${binary:Version})
+Recommends: gnome-power-manager,
+            notification-daemon
 Suggests: gnome-user-guide,
           desktop-base,
           gnome-keyring
-Description: The GNOME Session Manager - GNOME 3 session
- This package contains a session that can be started from a display
- manager such as GDM. It will load all necessary applications for a
- full-featured user session.
+Replaces: gnome-session (<< 3.0),
+          gnome-session-bin (<< 3.0)
+Provides: x-session-manager
+Description: GNOME Session Manager - GNOME fallback session
+ The GNOME Session Manager is in charge of starting the core components 
+ of the GNOME desktop, and applications that should be launched at 
+ login time. It also features a way to save and restore currently 
+ running applications.
  .
- The session manager also features the ability to save a running session
- an restore it later.
+ This package contains the required components for the GNOME 3 fallback
+ session, based on the GNOME Panel. It can be started from a display 
+ manager such as GDM, and doesn’t have specific hardware requirements.
 
 Package: gnome-session-bin
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          dbus-x11,
+         gsettings-desktop-schemas,
          upower (>= 0.9.0)
 Conflicts: gnome-session (<< 2.26.1-5)
-Replaces: gnome-session-common (<< 2.91.91.3-1)
-Description: The GNOME Session Manager - Minimal runtime
+Description: GNOME Session Manager - Minimal runtime
+ The GNOME Session Manager is in charge of starting the core components 
+ of the GNOME desktop, and applications that should be launched at 
+ login time. It also features a way to save and restore currently 
+ running applications.
+ .
  This package contains the binaries for the GNOME Session Manager, but
  no startup scripts. It is meant for those willing to start
  gnome-session by hand with the components of their choice, and for
  applications such as GDM that use gnome-session internally.
 
+Package: gnome-session-common
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: gnome-session (<< 3.0),
+          gnome-session-bin (<< 3.0),
+          libgnomevfs2-common (<< 1:2.24.0-3)
+Description: GNOME Session Manager - common files
+ The GNOME Session Manager is in charge of starting the core components 
+ of the GNOME desktop, and applications that should be launched at 
+ login time. It also features a way to save and restore currently 
+ running applications.
+ .
+ This package contains the translations, data files and startup scripts 
+ which are common to the GNOME and GNOME fallback sessions.

Modified: desktop/experimental/gnome-session/debian/gnome-session-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session-bin.install?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session-bin.install [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/gnome-session-bin.install [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,7 +1,6 @@
 debian/tmp/usr/bin/gnome-session*
 debian/tmp/usr/lib/gnome-session*
-debian/tmp/usr/share/gnome-session
-debian/tmp/usr/share/man/man1/gnome-session*
-debian/tmp/usr/share/glib-2.0/schemas/*
-debian/tmp/usr/share/GConf/gsettings/*
-debian/tmp/usr/share/applications/session-properties.desktop
+debian/tmp/usr/share/gnome-session/*.ui
+debian/tmp/usr/share/man/man1
+debian/tmp/usr/share/glib-2.0/schemas
+debian/tmp/usr/share/GConf/gsettings

Added: desktop/experimental/gnome-session/debian/gnome-session-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session-common.install?rev=27709&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session-common.install (added)
+++ desktop/experimental/gnome-session/debian/gnome-session-common.install [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,0 +1,5 @@
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
+debian/55gnome-session_gnomerc etc/X11/Xsession.d
+debian/defaults.list etc/gnome

Added: desktop/experimental/gnome-session/debian/gnome-session-fallback.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session-fallback.install?rev=27709&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session-fallback.install (added)
+++ desktop/experimental/gnome-session/debian/gnome-session-fallback.install [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,0 +1,4 @@
+debian/gnome-wm /usr/bin
+debian/gnome-wm.desktop /usr/share/applications
+debian/tmp/usr/share/xsessions/gnome-fallback.desktop
+debian/tmp/usr/share/gnome-session/sessions/gnome-fallback.session

Modified: desktop/experimental/gnome-session/debian/gnome-session.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session.install?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session.install [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/gnome-session.install [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,6 +1,3 @@
 debian/tmp/usr/share/doc
-debian/tmp/usr/share/xsessions
-debian/tmp/usr/share/icons
-debian/tmp/usr/share/locale
-debian/55gnome-session_gnomerc etc/X11/Xsession.d
-debian/defaults.list etc/gnome
+debian/tmp/usr/share/xsessions/gnome.desktop
+debian/tmp/usr/share/gnome-session/sessions/gnome.session

Modified: desktop/experimental/gnome-session/debian/gnome-session.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session.postinst?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session.postinst [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/gnome-session.postinst [utf-8] Wed Apr 20 21:12:55 2011
@@ -9,14 +9,4 @@
     x-session-manager.1.gz /usr/share/man/man1/gnome-session.1.gz
 fi
 
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 2.28; then
-  update-alternatives --remove desktop-splash \
-    /usr/share/pixmaps/splash/gnome-splash.png
-  update-alternatives --remove desktop-splash \
-    /usr/share/pixmaps/splash/gnome-debian-splash.png
-  if which update-gconf-defaults >/dev/null 2>&1; then
-    update-gconf-defaults
-  fi
-fi
-
 #DEBHELPER#

Added: desktop/experimental/gnome-session/debian/gnome-wm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-wm?rev=27709&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-wm (added)
+++ desktop/experimental/gnome-session/debian/gnome-wm [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,0 +1,38 @@
+#!/bin/sh
+
+# The user can specify his prefered WM by setting the WINDOW_MANAGER
+# environment variable.
+#
+# If this is not set, we search a list of known windowmanagers and use
+# the first one that is found in the users's PATH
+
+# Avoid looping if the session configuration tells us to use gnome-wm or if
+# the user forces gnome-wm via WINDOW_MANAGER
+if [ "x$WINDOW_MANAGER" = "xgnome-wm" ]; then
+  WINDOW_MANAGER=""
+fi
+
+if [ -z "$WINDOW_MANAGER" ] ; then
+  # Create a list of window manager we can handle, trying to only use the
+  # compositing ones when it makes sense
+
+  KNOWN_WM="metacity mutter sawfish"
+
+  for wm in $KNOWN_WM; do
+    if [ -x /usr/bin/"$wm" ]; then
+      WINDOW_MANAGER=/usr/bin/"$wm"
+      break
+    fi
+  done
+
+fi
+
+# Look for the default window manager on the system
+
+if [ -z "$WINDOW_MANAGER" ] ; then
+  WINDOW_MANAGER=$(readlink /etc/alternatives/x-window-manager 2>/dev/null)
+fi
+
+exec "$WINDOW_MANAGER" "$@"
+
+echo "ERROR: No window manager could run!"

Propchange: desktop/experimental/gnome-session/debian/gnome-wm
------------------------------------------------------------------------------
    svn:executable = *

Added: desktop/experimental/gnome-session/debian/gnome-wm.desktop
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-wm.desktop?rev=27709&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-wm.desktop (added)
+++ desktop/experimental/gnome-session/debian/gnome-wm.desktop [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,0 +1,107 @@
+[Desktop Entry]
+Type=Application
+Name=Window Manager
+Name[af]=Vensterbestuurder
+Name[am]=መስኮቱን መቆጣጠሪያ
+Name[ar]=مدير النوافذ
+Name[as]=সংযোগক্ষেত্ৰ পৰিচালক
+Name[ast]=Alministrador de Ventanes
+Name[az]=Pəncərə İdarəçisi
+Name[be]=Кіраўнік вокнаў
+Name[be at latin]=Kiraŭnik voknaŭ
+Name[bg]=Мениджър на прозорци
+Name[bn]=উইন্ডো ম্যানেজার
+Name[bn_IN]=উইন্ডো পরিচালন ব্যবস্থা
+Name[br]=ardoer prenestroù
+Name[bs]=Menadžer prozora
+Name[ca]=Gestor de finestres
+Name[ca at valencia]=Gestor de finestres
+Name[crh]=Pencere İdarecisi
+Name[cs]=Správce oken
+Name[cy]=Rheolwr Ffenestri
+Name[da]=Vindueshåndtering
+Name[de]=Fenstermanager
+Name[dz]=སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ།
+Name[el]=Διαχειριστής παραθύρων
+Name[en at shaw]=𐑢𐑦𐑯𐑛𐑴 𐑥𐑨𐑯𐑩𐑡𐑼
+Name[en_CA]=Window Manager
+Name[en_GB]=Window Manager
+Name[eo]=Fenestradministrilo
+Name[es]=Gestor de ventanas
+Name[et]=Aknahaldur
+Name[eu]=Leiho-kudeatzailea
+Name[fa]=مدیر پنجره‌ها
+Name[fi]=Ikkunointiohjelma
+Name[fr]=Gestionnaire de fenêtres
+Name[fur]=Window Manager
+Name[ga]=Bainisteoir Fuinneoga
+Name[gl]=Xestor de xanelas
+Name[gu]=વિન્ડો સંચાલક
+Name[ha]=Manajan Taga
+Name[he]=Window Manager
+Name[hi]=विन्डो मैनेजर
+Name[hr]=Upravitelj prozora
+Name[hu]=Ablakkezelő
+Name[hy]=Պատուհանի մենեջեր
+Name[id]=Pengatur Jendela
+Name[ig]=Onyenlekọta Windo 
+Name[is]=Gluggastjóri
+Name[it]=Window manager
+Name[ja]=ウインドウ・マネージャ
+Name[ka]=ფანჯარათა მმართველი
+Name[kn]=ವಿಂಡೋ ವ್ಯವಸ್ಥಾಪಕ
+Name[ko]=창 관리자
+Name[ku]=Menajerê Paceyan
+Name[lt]=Langų valdyklė
+Name[lv]=Logu pārvaldnieks
+Name[mai]=विन्डो मैनेजर
+Name[mg]=Mpandrindra fikandrana
+Name[mk]=Менаџер за прозорци
+Name[ml]=ജാലക പാലകന്‍
+Name[mn]=Цонхны менежер
+Name[mr]=खिडकी व्यवस्थापक
+Name[ms]=Pengurus Tetingkap
+Name[nb]=Vindushåndterer
+Name[nds]=Finsteroppasser
+Name[ne]=सञ्झ्याल प्रबन्धक
+Name[nl]=Windowmanager
+Name[nn]=Vindaugehandsamar
+Name[nso]=Molaodi wa Lefesetere
+Name[oc]=Gestionari de fenèstras
+Name[or]=ୱିଣ୍ଡୋ ପରିଚାଳକ
+Name[pa]=ਵਿੰਡੋ ਮੈਨੇਜਰ
+Name[pl]=Menedżer okien
+Name[ps]=کړکۍ سمبالګر
+Name[pt]=Gestor de Janelas
+Name[pt_BR]=Gerenciador de janelas
+Name[ro]=Administrator de ferestre
+Name[ru]=Менеджер окон
+Name[rw]=Umuyobozi w'idirishya
+Name[si]=කවුළු කළමණාකරු
+Name[sk]=Správca okien
+Name[sl]=Upravljalnik oken
+Name[sq]=Organizuesi i dritareve
+Name[sr]=Управник прозора
+Name[sr at latin]=Upravnik prozora
+Name[sv]=Fönsterhanterare
+Name[ta]=சாளரமேலாளர்
+Name[te]=గవాక్ష నిర్వాహకి
+Name[th]=โปรแกรมจัดการหน้าต่าง
+Name[tk]=Äpişge Müdiri
+Name[tr]=Pencere Yöneticisi
+Name[uk]=Віконний менеджер
+Name[uz]=Oyna boshqaruvchisi
+Name[uz at cyrillic]=Ойна бошқарувчиси
+Name[vi]=Bộ quản lý cửa sổ
+Name[wa]=Manaedjeu di purneas
+Name[xh]=Umlawuli Wefestile
+Name[yo]=Alábòójútó Fèrèsé
+Name[zh_CN]=窗口管理器
+Name[zh_HK]=視窗管理員
+Name[zh_TW]=視窗管理員
+Name[zu]=Umphathi wefasitela
+Exec=gnome-wm
+NoDisplay=true
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true

Added: desktop/experimental/gnome-session/debian/patches/01_gnome-wm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/01_gnome-wm.patch?rev=27709&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/01_gnome-wm.patch (added)
+++ desktop/experimental/gnome-session/debian/patches/01_gnome-wm.patch [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,0 +1,11 @@
+Index: gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in
+===================================================================
+--- gnome-session-3.0.0.orig/data/gnome-fallback.session.desktop.in.in	2011-04-20 21:19:19.751604438 +0200
++++ gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in	2011-04-20 21:19:24.495627620 +0200
+@@ -2,5 +2,5 @@
+ _Name=GNOME fallback
+ RequiredComponents=gnome-panel;gnome-settings-daemon;
+ RequiredProviders=windowmanager;notifications;
+-DefaultProvider-windowmanager=metacity
++DefaultProvider-windowmanager=gnome-wm
+ DefaultProvider-notifications=notification-daemon

Added: desktop/experimental/gnome-session/debian/patches/02_fallback_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/02_fallback_desktop.patch?rev=27709&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/02_fallback_desktop.patch (added)
+++ desktop/experimental/gnome-session/debian/patches/02_fallback_desktop.patch [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,0 +1,25 @@
+Index: gnome-session-3.0.0/data/Makefile.am
+===================================================================
+--- gnome-session-3.0.0.orig/data/Makefile.am	2011-04-20 22:23:50.418527166 +0200
++++ gnome-session-3.0.0/data/Makefile.am	2011-04-20 22:24:24.814695322 +0200
+@@ -6,7 +6,7 @@ ui_DATA = \
+ 	gsm-inhibit-dialog.ui
+ 
+ xsessiondir = $(datadir)/xsessions
+-xsession_in_files = gnome.desktop.in
++xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in
+ xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
+ 
+ desktopdir = $(datadir)/applications
+Index: gnome-session-3.0.0/data/gnome-fallback.desktop.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-session-3.0.0/data/gnome-fallback.desktop.in	2011-04-20 22:23:44.014495913 +0200
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++_Name=GNOME fallback
++_Comment=This session logs you into GNOME
++Exec=gnome-session --session gnome-fallback
++TryExec=gnome-session
++Icon=
++Type=Application

Modified: desktop/experimental/gnome-session/debian/patches/10_session_save.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/10_session_save.patch?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/10_session_save.patch [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/10_session_save.patch [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,18 +1,18 @@
 Based on the patch in GNOME #575544
 
-Index: gnome-session-2.91.91.3/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-manager.c	2011-02-26 23:53:37.000000000 +0100
-+++ gnome-session-2.91.91.3/gnome-session/gsm-manager.c	2011-03-14 18:39:39.154303002 +0100
-@@ -69,6 +69,7 @@
- #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
- 
- #define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */
+Index: gnome-session-3.0.0/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-3.0.0.orig/gnome-session/gsm-manager.c	2011-03-30 09:47:33.000000000 +0200
++++ gnome-session-3.0.0/gnome-session/gsm-manager.c	2011-04-20 21:13:32.237905522 +0200
+@@ -79,6 +79,7 @@
+  * let's make this fairly long.
+  */
+ #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
 +#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
  
  #define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
  #define GDM_FLEXISERVER_ARGS    "--startnew Standard"
-@@ -1306,6 +1307,69 @@
+@@ -1405,6 +1406,69 @@ query_end_session_complete (GsmManager *
  
  }
  
@@ -82,7 +82,7 @@
  static guint32
  generate_cookie (void)
  {
-@@ -1386,6 +1450,21 @@
+@@ -1485,6 +1549,21 @@ _on_query_end_session_timeout (GsmManage
          return FALSE;
  }
  
@@ -104,7 +104,7 @@
  static void
  do_phase_query_end_session (GsmManager *manager)
  {
-@@ -2054,13 +2133,32 @@
+@@ -2160,13 +2239,32 @@ _handle_client_end_session_response (Gsm
                                       gboolean    cancel,
                                       const char *reason)
  {
@@ -139,7 +139,7 @@
          if (cancel) {
                  cancel_end_session (manager);
                  return;
-@@ -2175,6 +2273,15 @@
+@@ -2281,6 +2379,15 @@ on_xsmp_client_logout_request (GsmXSMPCl
  }
  
  static void
@@ -155,7 +155,7 @@
  on_store_client_added (GsmStore   *store,
                         const char *id,
                         GsmManager *manager)
-@@ -2195,6 +2302,10 @@
+@@ -2301,6 +2408,10 @@ on_store_client_added (GsmStore   *store
                                    "logout-request",
                                    G_CALLBACK (on_xsmp_client_logout_request),
                                    manager);
@@ -166,7 +166,7 @@
          }
  
          g_signal_connect (client,
-@@ -3237,6 +3348,41 @@
+@@ -3324,6 +3435,41 @@ gsm_manager_shutdown (GsmManager *manage
  }
  
  gboolean
@@ -208,11 +208,11 @@
  gsm_manager_can_shutdown (GsmManager *manager,
                            gboolean   *shutdown_available,
                            GError    **error)
-Index: gnome-session-2.91.91.3/gnome-session/gsm-manager.h
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-manager.h	2011-02-16 17:59:36.000000000 +0100
-+++ gnome-session-2.91.91.3/gnome-session/gsm-manager.h	2011-03-14 18:39:39.154303002 +0100
-@@ -160,6 +160,9 @@
+Index: gnome-session-3.0.0/gnome-session/gsm-manager.h
+===================================================================
+--- gnome-session-3.0.0.orig/gnome-session/gsm-manager.h	2011-03-22 21:31:43.000000000 +0100
++++ gnome-session-3.0.0/gnome-session/gsm-manager.h	2011-04-20 21:12:54.057718875 +0200
+@@ -164,6 +164,9 @@ gboolean            gsm_manager_is_inhib
  gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
                                                                  GError        **error);
  
@@ -222,11 +222,11 @@
  gboolean            gsm_manager_can_shutdown                   (GsmManager     *manager,
                                                                  gboolean       *shutdown_available,
                                                                  GError        **error);
-Index: gnome-session-2.91.91.3/gnome-session/gsm-xsmp-client.c
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-xsmp-client.c	2010-11-30 08:07:11.000000000 +0100
-+++ gnome-session-2.91.91.3/gnome-session/gsm-xsmp-client.c	2011-03-14 18:39:39.158303002 +0100
-@@ -67,6 +67,7 @@
+Index: gnome-session-3.0.0/gnome-session/gsm-xsmp-client.c
+===================================================================
+--- gnome-session-3.0.0.orig/gnome-session/gsm-xsmp-client.c	2011-03-22 21:31:43.000000000 +0100
++++ gnome-session-3.0.0/gnome-session/gsm-xsmp-client.c	2011-04-20 21:12:54.057718875 +0200
+@@ -68,6 +68,7 @@ enum {
  enum {
          REGISTER_REQUEST,
          LOGOUT_REQUEST,
@@ -234,7 +234,7 @@
          LAST_SIGNAL
  };
  
-@@ -500,6 +501,30 @@
+@@ -501,6 +502,30 @@ xsmp_cancel_end_session (GsmClient *clie
          return TRUE;
  }
  
@@ -265,7 +265,7 @@
  static char *
  get_desktop_file_path (GsmXSMPClient *client)
  {
-@@ -974,6 +999,7 @@
+@@ -970,6 +995,7 @@ gsm_xsmp_client_class_init (GsmXSMPClien
          object_class->get_property         = gsm_xsmp_client_get_property;
          object_class->set_property         = gsm_xsmp_client_set_property;
  
@@ -273,7 +273,7 @@
          client_class->impl_save                   = xsmp_save;
          client_class->impl_stop                   = xsmp_stop;
          client_class->impl_query_end_session      = xsmp_query_end_session;
-@@ -1001,6 +1027,17 @@
+@@ -997,6 +1023,17 @@ gsm_xsmp_client_class_init (GsmXSMPClien
                                NULL,
                                NULL,
                                g_cclosure_marshal_VOID__BOOLEAN,
@@ -291,11 +291,11 @@
                                G_TYPE_NONE,
                                1, G_TYPE_BOOLEAN);
  
-Index: gnome-session-2.91.91.3/gnome-session/gsm-xsmp-client.h
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-xsmp-client.h	2010-10-12 17:47:12.000000000 +0200
-+++ gnome-session-2.91.91.3/gnome-session/gsm-xsmp-client.h	2011-03-14 18:39:39.158303002 +0100
-@@ -54,7 +54,8 @@
+Index: gnome-session-3.0.0/gnome-session/gsm-xsmp-client.h
+===================================================================
+--- gnome-session-3.0.0.orig/gnome-session/gsm-xsmp-client.h	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-3.0.0/gnome-session/gsm-xsmp-client.h	2011-04-20 21:12:54.061718891 +0200
+@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
                                            char          **client_id);
          gboolean (*logout_request)       (GsmXSMPClient  *client,
                                            gboolean        prompt);
@@ -305,10 +305,10 @@
  
          void     (*saved_state)          (GsmXSMPClient  *client);
  
-Index: gnome-session-2.91.91.3/gnome-session/org.gnome.SessionManager.xml
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/org.gnome.SessionManager.xml	2010-10-12 17:47:12.000000000 +0200
-+++ gnome-session-2.91.91.3/gnome-session/org.gnome.SessionManager.xml	2011-03-14 18:39:39.158303002 +0100
+Index: gnome-session-3.0.0/gnome-session/org.gnome.SessionManager.xml
+===================================================================
+--- gnome-session-3.0.0.orig/gnome-session/org.gnome.SessionManager.xml	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-3.0.0/gnome-session/org.gnome.SessionManager.xml	2011-04-20 21:12:54.061718891 +0200
 @@ -256,6 +256,14 @@
        </doc:doc>
      </method>
@@ -324,10 +324,10 @@
      <method name="CanShutdown">
        <arg name="is_available" direction="out" type="b">
          <doc:doc>
-Index: gnome-session-2.91.91.3/capplet/gsm-properties-dialog.c
-===================================================================
---- gnome-session-2.91.91.3.orig/capplet/gsm-properties-dialog.c	2011-02-10 01:51:46.000000000 +0100
-+++ gnome-session-2.91.91.3/capplet/gsm-properties-dialog.c	2011-03-14 18:39:39.158303002 +0100
+Index: gnome-session-3.0.0/capplet/gsm-properties-dialog.c
+===================================================================
+--- gnome-session-3.0.0.orig/capplet/gsm-properties-dialog.c	2011-03-22 21:31:42.000000000 +0100
++++ gnome-session-3.0.0/capplet/gsm-properties-dialog.c	2011-04-20 21:12:54.061718891 +0200
 @@ -33,6 +33,12 @@
  #include "gsm-util.h"
  #include "gsp-app.h"
@@ -349,7 +349,7 @@
  #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
  
  #define STARTUP_APP_ICON     "system-run"
-@@ -455,10 +462,64 @@
+@@ -455,10 +462,64 @@ on_row_activated (GtkTreeView         *t
  }
  
  static void
@@ -415,11 +415,11 @@
  }
  
  static void
-Index: gnome-session-2.91.91.3/configure.ac
-===================================================================
---- gnome-session-2.91.91.3.orig/configure.ac	2011-03-09 17:46:06.000000000 +0100
-+++ gnome-session-2.91.91.3/configure.ac	2011-03-14 18:40:07.838303002 +0100
-@@ -63,6 +63,7 @@
+Index: gnome-session-3.0.0/configure.ac
+===================================================================
+--- gnome-session-3.0.0.orig/configure.ac	2011-03-30 09:47:33.000000000 +0200
++++ gnome-session-3.0.0/configure.ac	2011-04-20 21:12:54.061718891 +0200
+@@ -63,6 +63,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
  PKG_CHECK_MODULES(SESSION_PROPERTIES,
          glib-2.0 >= $GLIB_REQUIRED
          gtk+-3.0 >= $GTK3_REQUIRED
@@ -427,11 +427,11 @@
  )
  
  PKG_CHECK_MODULES(SM, sm)
-Index: gnome-session-2.91.91.3/gnome-session/gsm-client.h
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-client.h	2010-10-12 17:47:12.000000000 +0200
-+++ gnome-session-2.91.91.3/gnome-session/gsm-client.h	2011-03-14 18:39:39.158303002 +0100
-@@ -92,6 +92,9 @@
+Index: gnome-session-3.0.0/gnome-session/gsm-client.h
+===================================================================
+--- gnome-session-3.0.0.orig/gnome-session/gsm-client.h	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-3.0.0/gnome-session/gsm-client.h	2011-04-20 21:12:54.061718891 +0200
+@@ -92,6 +92,9 @@ struct _GsmClientClass
                                                                GError   **error);
          gboolean              (*impl_stop)                   (GsmClient *client,
                                                                GError   **error);
@@ -441,7 +441,7 @@
          GKeyFile *            (*impl_save)                   (GsmClient *client,
                                                                GError   **error);
  };
-@@ -137,6 +140,9 @@
+@@ -137,6 +140,9 @@ gboolean              gsm_client_cancel_
  
  void                  gsm_client_disconnected               (GsmClient  *client);
  
@@ -451,11 +451,11 @@
  GKeyFile             *gsm_client_save                       (GsmClient  *client,
                                                               GError    **error);
  /* exported to bus */
-Index: gnome-session-2.91.91.3/gnome-session/gsm-dbus-client.c
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-dbus-client.c	2010-11-30 08:07:11.000000000 +0100
-+++ gnome-session-2.91.91.3/gnome-session/gsm-dbus-client.c	2011-03-14 18:39:39.158303002 +0100
-@@ -412,6 +412,19 @@
+Index: gnome-session-3.0.0/gnome-session/gsm-dbus-client.c
+===================================================================
+--- gnome-session-3.0.0.orig/gnome-session/gsm-dbus-client.c	2011-03-22 21:31:43.000000000 +0100
++++ gnome-session-3.0.0/gnome-session/gsm-dbus-client.c	2011-04-20 21:12:54.061718891 +0200
+@@ -412,6 +412,19 @@ gsm_dbus_client_finalize (GObject *objec
          G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
  }
  
@@ -475,7 +475,7 @@
  static GKeyFile *
  dbus_client_save (GsmClient *client,
                    GError   **error)
-@@ -664,6 +677,7 @@
+@@ -664,6 +677,7 @@ gsm_dbus_client_class_init (GsmDBusClien
          object_class->set_property         = gsm_dbus_client_set_property;
          object_class->dispose              = gsm_dbus_client_dispose;
  
@@ -483,11 +483,11 @@
          client_class->impl_save                   = dbus_client_save;
          client_class->impl_stop                   = dbus_client_stop;
          client_class->impl_query_end_session      = dbus_client_query_end_session;
-Index: gnome-session-2.91.91.3/gnome-session/gsm-client.c
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-client.c	2010-10-12 17:47:12.000000000 +0200
-+++ gnome-session-2.91.91.3/gnome-session/gsm-client.c	2011-03-14 18:39:39.158303002 +0100
-@@ -510,6 +510,16 @@
+Index: gnome-session-3.0.0/gnome-session/gsm-client.c
+===================================================================
+--- gnome-session-3.0.0.orig/gnome-session/gsm-client.c	2010-02-09 14:22:01.000000000 +0100
++++ gnome-session-3.0.0/gnome-session/gsm-client.c	2011-04-20 21:12:54.061718891 +0200
+@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *clie
          g_signal_emit (client, signals[DISCONNECTED], 0);
  }
  
@@ -504,10 +504,10 @@
  GKeyFile *
  gsm_client_save (GsmClient *client,
                   GError   **error)
-Index: gnome-session-2.91.91.3/data/session-properties.ui
-===================================================================
---- gnome-session-2.91.91.3.orig/data/session-properties.ui	2010-10-12 17:47:12.000000000 +0200
-+++ gnome-session-2.91.91.3/data/session-properties.ui	2011-03-14 18:39:39.158303002 +0100
+Index: gnome-session-3.0.0/data/session-properties.ui
+===================================================================
+--- gnome-session-3.0.0.orig/data/session-properties.ui	2011-03-22 21:31:43.000000000 +0100
++++ gnome-session-3.0.0/data/session-properties.ui	2011-04-20 21:12:54.061718891 +0200
 @@ -148,6 +148,7 @@
              <property name="visible">True</property>
              <child>

Modified: desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,12 +1,12 @@
-diff --git a/data/gnome-fallback.session.desktop.in.in b/data/gnome-fallback.session.desktop.in.in
-index a200e48..df9554e 100644
---- a/data/gnome-fallback.session.desktop.in.in
-+++ b/data/gnome-fallback.session.desktop.in.in
+Index: gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in
+===================================================================
+--- gnome-session-3.0.0.orig/data/gnome-fallback.session.desktop.in.in	2011-04-20 21:41:41.000000000 +0200
++++ gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in	2011-04-20 21:41:56.166235784 +0200
 @@ -1,6 +1,6 @@
  [GNOME Session]
  _Name=GNOME fallback
  RequiredComponents=gnome-panel;gnome-settings-daemon;
 -RequiredProviders=windowmanager;notifications;
 +RequiredProviders=windowmanager;
- DefaultProvider-windowmanager=metacity
+ DefaultProvider-windowmanager=gnome-wm
  DefaultProvider-notifications=notification-daemon

Modified: desktop/experimental/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/series?rev=27709&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/series [utf-8] Wed Apr 20 21:12:55 2011
@@ -1,4 +1,5 @@
+01_gnome-wm.patch
+02_fallback_desktop.patch
 10_session_save.patch
-11_saved_session_name.patch
 12_no_gdm_fallback.patch
 13_no_fallback_notification.patch




More information about the pkg-gnome-commits mailing list