r22920 - in /desktop/unstable/gnome-session/debian: ./ patches/ scripts/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jan 30 15:19:31 UTC 2010
Author: joss
Date: Sat Jan 30 15:19:30 2010
New Revision: 22920
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22920
Log:
* Remove obsolete gnome-session.dirs.
* 55gnome-session_gnomerc: add gnome3-session.
* README.Debian: fix documentation of window manager startup according
to the previous upload.
* Add a gnome3-session binary and a corresponding package, that starts
gnome-shell instead of gnome-panel + metacity.
* 11_saved_session_name.patch: new patch. Allow to change the
directory where the session is saved with the command line. The
corresponding option is used by gnome3-session.
* Split translations, icons and startup scripts in a new
gnome-session-common package.
* Straighten dependencies accordingly.
Added:
desktop/unstable/gnome-session/debian/gnome-session-common.install
- copied, changed from r22914, desktop/unstable/gnome-session/debian/gnome-session.install
desktop/unstable/gnome-session/debian/gnome-session-common.links
- copied unchanged from r22914, desktop/unstable/gnome-session/debian/gnome-session.links
desktop/unstable/gnome-session/debian/gnome3-session.gconf-defaults
desktop/unstable/gnome-session/debian/gnome3-session.install
desktop/unstable/gnome-session/debian/gnome3-session.links
desktop/unstable/gnome-session/debian/gnome3-session.postinst
- copied, changed from r22914, desktop/unstable/gnome-session/debian/gnome-session.postinst
desktop/unstable/gnome-session/debian/gnome3-session.prerm
- copied, changed from r22914, desktop/unstable/gnome-session/debian/gnome-session.prerm
desktop/unstable/gnome-session/debian/gnome3.desktop.in
desktop/unstable/gnome-session/debian/patches/11_saved_session_name.patch
desktop/unstable/gnome-session/debian/scripts/
desktop/unstable/gnome-session/debian/scripts/gnome3-session
Removed:
desktop/unstable/gnome-session/debian/gnome-session.dirs
desktop/unstable/gnome-session/debian/gnome-session.links
Modified:
desktop/unstable/gnome-session/debian/55gnome-session_gnomerc
desktop/unstable/gnome-session/debian/README.Debian
desktop/unstable/gnome-session/debian/changelog
desktop/unstable/gnome-session/debian/control
desktop/unstable/gnome-session/debian/control.in
desktop/unstable/gnome-session/debian/gnome-session.install
desktop/unstable/gnome-session/debian/patches/series
desktop/unstable/gnome-session/debian/rules
Modified: desktop/unstable/gnome-session/debian/55gnome-session_gnomerc
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/55gnome-session_gnomerc?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/55gnome-session_gnomerc [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/55gnome-session_gnomerc [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,20 +1,22 @@
# If we are running the GNOME session, source ~/.gnomerc
-BASESTARTUP=`basename "$STARTUP" | cut -d\ -f1`
-if [ "$BASESTARTUP" = gnome-session -o \
- \( "$BASESTARTUP" = x-session-manager -a \
- "`readlink /etc/alternatives/x-session-manager`" = \
- /usr/bin/gnome-session \) ]; then
- GNOMERC=$HOME/.gnomerc
- if [ -r "$GNOMERC" ]; then
- . "$GNOMERC"
- fi
- # We prepend /usr/share/gnome since its defaults.list actually points
- # to /etc so it is configurable.
- if [ -z "$XDG_DATA_DIRS" ]; then
- XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
- else
- XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
- fi
- export XDG_DATA_DIRS
+BASESTARTUP=$(basename "$STARTUP" | cut -d\ -f1)
+if [ "$BASESTARTUP" = x-session-manager ]; then
+ BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
fi
+case "$BASESTARTUP" in
+ gnome-session|gnome3-session)
+ GNOMERC=$HOME/.gnomerc
+ if [ -r "$GNOMERC" ]; then
+ . "$GNOMERC"
+ fi
+ # We prepend /usr/share/gnome since its defaults.list actually points
+ # to /etc so it is configurable.
+ if [ -z "$XDG_DATA_DIRS" ]; then
+ XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+ else
+ XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+ fi
+ export XDG_DATA_DIRS
+ ;;
+esac
Modified: desktop/unstable/gnome-session/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/README.Debian?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/README.Debian [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/README.Debian [utf-8] Sat Jan 30 15:19:30 2010
@@ -33,10 +33,11 @@
Changing the window manager
---------------------------
-By default, gnome-session tries to start mutter (if 3D compositing is
-available), metacity or sawfish if they are installed, then falls back
-to the system default.
+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/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,9 +1,21 @@
-gnome-session (2.28.0-5) UNRELEASED; urgency=low
+gnome-session (2.28.0-5) unstable; urgency=low
* defaults.list: add text/x-patch. Some packages set brain-dead MIME
handlers for this.
-
- -- Josselin Mouette <joss at debian.org> Thu, 07 Jan 2010 21:28:05 +0100
+ * Remove obsolete gnome-session.dirs.
+ * 55gnome-session_gnomerc: add gnome3-session.
+ * README.Debian: fix documentation of window manager startup according
+ to the previous upload.
+ * Add a gnome3-session binary and a corresponding package, that starts
+ gnome-shell instead of gnome-panel + metacity.
+ * 11_saved_session_name.patch: new patch. Allow to change the
+ directory where the session is saved with the command line. The
+ corresponding option is used by gnome3-session.
+ * Split translations, icons and startup scripts in a new
+ gnome-session-common package.
+ * Straighten dependencies accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 30 Jan 2010 12:52:45 +0100
gnome-session (2.28.0-4) unstable; urgency=low
Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: gnome-session
Section: gnome
Priority: optional
@@ -32,28 +37,60 @@
Architecture: all
Depends: ${misc:Depends},
gnome-settings-daemon (>= 2.26),
- gnome-panel,
+ gnome-panel (>= 2.26),
metacity | mutter | sawfish,
nautilus (>= 2.26),
policykit-1-gnome,
gnome-session-bin (>= ${gnome:Version}),
- gnome-session-bin (<< ${gnome:NextVersion})
+ gnome-session-bin (<< ${gnome:NextVersion}),
+ gnome-session-common (= ${binary:Version})
Recommends: gnome-power-manager (>= 2.28)
-Replaces: libgnomevfs2-common (<< 1:2.24.0-3)
-Conflicts: bug-buddy (<< 2.20),
- libgnomevfs2-common (<< 1:2.24.0-3)
-Breaks: gnome-panel (<< 2.26),
+Breaks: bug-buddy (<< 2.20),
xserver-xorg (<< 1:7.4),
gnome-power-manager (<< 2.28)
Provides: x-session-manager
-Suggests: gnome-user-guide | gnome2-user-guide,
+Suggests: gnome-user-guide,
desktop-base,
gnome-keyring
-Description: The GNOME Session Manager
- This package contains an X11-compliant "session manager" (similar to xsm)
- with GNOME extensions. When you log out, the session manager will save the
- state of all your GNOME apps. When you log back in, the session manager
- will restore your session.
+Description: The GNOME Session Manager - GNOME 2 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.
+ .
+ The session manager also features the ability to save a running session
+ an restore it later.
+ .
+ This version is configured to start the GNOME 2 desktop, based on the
+ GNOME panel.
+
+Package: gnome3-session
+Architecture: all
+Depends: ${misc:Depends},
+ gnome-settings-daemon (>= 2.26),
+ gnome-shell,
+ nautilus (>= 2.26),
+ policykit-1-gnome,
+ gnome-session-bin (>= ${gnome:Version}),
+ gnome-session-bin (<< ${gnome:NextVersion}),
+ gnome-session-common (= ${binary:Version})
+Recommends: gnome-power-manager (>= 2.28)
+Breaks: bug-buddy (<< 2.20),
+ xserver-xorg (<< 1:7.4),
+ gnome-power-manager (<< 2.28)
+Provides: x-session-manager
+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.
+ .
+ The session manager also features the ability to save a running session
+ an restore it later.
+ .
+ This version is configured to start the GNOME 3 desktop, based on the
+ GNOME shell.
Package: gnome-session-bin
Architecture: any
@@ -67,3 +104,14 @@
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 (<< 2.28.0-5),
+ libgnomevfs2-common (<< 1:2.24.0-3)
+Conflicts: gnome-session (<< 2.28.0-5),
+ libgnomevfs2-common (<< 1:2.24.0-3)
+Description: Common files for the GNOME session manager
+ This package contains common files for the GNOME 2 and GNOME 3
+ sessions, such as icons, translations and startup scripts.
Modified: desktop/unstable/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control.in?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control.in [utf-8] Sat Jan 30 15:19:30 2010
@@ -32,28 +32,60 @@
Architecture: all
Depends: ${misc:Depends},
gnome-settings-daemon (>= 2.26),
- gnome-panel,
+ gnome-panel (>= 2.26),
metacity | mutter | sawfish,
nautilus (>= 2.26),
policykit-1-gnome,
- gnome-session-bin (>= ${gnome:Version}),
- gnome-session-bin (<< ${gnome:NextVersion})
+ gnome-session-bin (>= ${binary:Version}),
+ gnome-session-bin (<< ${gnome:NextVersion}),
+ gnome-session-common (= ${binary:Version})
Recommends: gnome-power-manager (>= 2.28)
-Replaces: libgnomevfs2-common (<< 1:2.24.0-3)
-Conflicts: bug-buddy (<< 2.20),
- libgnomevfs2-common (<< 1:2.24.0-3)
-Breaks: gnome-panel (<< 2.26),
+Breaks: bug-buddy (<< 2.20),
xserver-xorg (<< 1:7.4),
gnome-power-manager (<< 2.28)
Provides: x-session-manager
-Suggests: gnome-user-guide | gnome2-user-guide,
+Suggests: gnome-user-guide,
desktop-base,
gnome-keyring
-Description: The GNOME Session Manager
- This package contains an X11-compliant "session manager" (similar to xsm)
- with GNOME extensions. When you log out, the session manager will save the
- state of all your GNOME apps. When you log back in, the session manager
- will restore your session.
+Description: The GNOME Session Manager - GNOME 2 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.
+ .
+ The session manager also features the ability to save a running session
+ an restore it later.
+ .
+ This version is configured to start the GNOME 2 desktop, based on the
+ GNOME panel.
+
+Package: gnome3-session
+Architecture: all
+Depends: ${misc:Depends},
+ gnome-settings-daemon (>= 2.26),
+ gnome-shell,
+ nautilus (>= 2.26),
+ policykit-1-gnome,
+ gnome-session-bin (>= ${binary:Version}),
+ gnome-session-bin (<< ${gnome:NextVersion}),
+ gnome-session-common (= ${binary:Version})
+Recommends: gnome-power-manager (>= 2.28)
+Breaks: bug-buddy (<< 2.20),
+ xserver-xorg (<< 1:7.4),
+ gnome-power-manager (<< 2.28)
+Provides: x-session-manager
+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.
+ .
+ The session manager also features the ability to save a running session
+ an restore it later.
+ .
+ This version is configured to start the GNOME 3 desktop, based on the
+ GNOME shell.
Package: gnome-session-bin
Architecture: any
@@ -67,3 +99,14 @@
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 (<< 2.28.0-5),
+ libgnomevfs2-common (<< 1:2.24.0-3)
+Conflicts: gnome-session (<< 2.28.0-5),
+ libgnomevfs2-common (<< 1:2.24.0-3)
+Description: Common files for the GNOME session manager
+ This package contains common files for the GNOME 2 and GNOME 3
+ sessions, such as icons, translations and startup scripts.
Copied: desktop/unstable/gnome-session/debian/gnome-session-common.install (from r22914, desktop/unstable/gnome-session/debian/gnome-session.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session-common.install?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.install [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/gnome-session-common.install [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,10 +1,6 @@
debian/tmp/etc/xdg/autostart usr/share/gnome
-debian/tmp/usr/bin/gnome-wm
-debian/tmp/usr/share/applications
-debian/tmp/usr/share/doc
+debian/tmp/usr/share/applications/session-properties.desktop
debian/tmp/usr/share/icons
debian/tmp/usr/share/locale
-debian/tmp/usr/share/man/man1/gnome-wm*
-debian/tmp/usr/share/xsessions
debian/55gnome-session_gnomerc etc/X11/Xsession.d
debian/defaults.list etc/gnome
Modified: desktop/unstable/gnome-session/debian/gnome-session.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-session.install?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.install [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/gnome-session.install [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,10 +1,5 @@
-debian/tmp/etc/xdg/autostart usr/share/gnome
debian/tmp/usr/bin/gnome-wm
-debian/tmp/usr/share/applications
+debian/tmp/usr/share/applications/gnome-wm.desktop
debian/tmp/usr/share/doc
-debian/tmp/usr/share/icons
-debian/tmp/usr/share/locale
debian/tmp/usr/share/man/man1/gnome-wm*
debian/tmp/usr/share/xsessions
-debian/55gnome-session_gnomerc etc/X11/Xsession.d
-debian/defaults.list etc/gnome
Added: desktop/unstable/gnome-session/debian/gnome3-session.gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome3-session.gconf-defaults?rev=22920&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome3-session.gconf-defaults (added)
+++ desktop/unstable/gnome-session/debian/gnome3-session.gconf-defaults [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,0 +1,2 @@
+/desktop/gnome/session/default_session3 [gnome-settings-daemon,gnome-shell]
+
Added: desktop/unstable/gnome-session/debian/gnome3-session.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome3-session.install?rev=22920&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome3-session.install (added)
+++ desktop/unstable/gnome-session/debian/gnome3-session.install [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,0 +1,2 @@
+debian/scripts/gnome3-session usr/bin
+debian/gnome3.desktop usr/share/xsessions
Added: desktop/unstable/gnome-session/debian/gnome3-session.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome3-session.links?rev=22920&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome3-session.links (added)
+++ desktop/unstable/gnome-session/debian/gnome3-session.links [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,0 +1,1 @@
+usr/share/man/man1/gnome-session.1.gz usr/share/man/man1/gnome3-session.1.gz
Copied: desktop/unstable/gnome-session/debian/gnome3-session.postinst (from r22914, desktop/unstable/gnome-session/debian/gnome-session.postinst)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome3-session.postinst?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.postinst [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/gnome3-session.postinst [utf-8] Sat Jan 30 15:19:30 2010
@@ -4,19 +4,9 @@
if [ "$1" = configure ]; then
update-alternatives --install /usr/bin/x-session-manager \
- x-session-manager /usr/bin/gnome-session 50 \
+ x-session-manager /usr/bin/gnome3-session 49 \
--slave /usr/share/man/man1/x-session-manager.1.gz \
- 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
+ x-session-manager.1.gz /usr/share/man/man1/gnome3-session.1.gz
fi
#DEBHELPER#
Copied: desktop/unstable/gnome-session/debian/gnome3-session.prerm (from r22914, desktop/unstable/gnome-session/debian/gnome-session.prerm)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome3-session.prerm?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-session.prerm [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/gnome3-session.prerm [utf-8] Sat Jan 30 15:19:30 2010
@@ -3,7 +3,7 @@
set -e
if [ "$1" = "remove" ]; then
- update-alternatives --remove x-session-manager /usr/bin/gnome-session
+ update-alternatives --remove x-session-manager /usr/bin/gnome3-session
fi
#DEBHELPER#
Added: desktop/unstable/gnome-session/debian/gnome3.desktop.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome3.desktop.in?rev=22920&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome3.desktop.in (added)
+++ desktop/unstable/gnome-session/debian/gnome3.desktop.in [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,0 +1,7 @@
+[Desktop Entry]
+_Name=GNOME 3
+_Comment=This session logs you into GNOME
+Exec=gnome3-session
+TryExec=gnome3-session
+Icon=
+Type=Application
Added: desktop/unstable/gnome-session/debian/patches/11_saved_session_name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/11_saved_session_name.patch?rev=22920&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/11_saved_session_name.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/11_saved_session_name.patch [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,0 +1,73 @@
+Index: gnome-session-2.28.0/gnome-session/gsm-util.c
+===================================================================
+--- gnome-session-2.28.0.orig/gnome-session/gsm-util.c 2010-01-30 14:56:30.457864587 +0100
++++ gnome-session-2.28.0/gnome-session/gsm-util.c 2010-01-30 15:07:16.206374931 +0100
+@@ -36,6 +36,7 @@
+
+ #include "gsm-util.h"
+
++static const gchar *_saved_session_dirname = "saved-session";
+ static gchar *_saved_session_dir = NULL;
+
+ char *
+@@ -175,6 +176,12 @@ gsm_util_get_empty_tmp_session_dir (void
+ return tmp;
+ }
+
++void
++gsm_util_set_saved_session_dirname (const char * dirname)
++{
++ _saved_session_dirname = dirname;
++}
++
+ const gchar *
+ gsm_util_get_saved_session_dir (void)
+ {
+@@ -184,7 +191,7 @@ gsm_util_get_saved_session_dir (void)
+ _saved_session_dir =
+ g_build_filename (g_get_user_config_dir (),
+ "gnome-session",
+- "saved-session",
++ _saved_session_dirname,
+ NULL);
+
+ exists = ensure_dir_exists (_saved_session_dir);
+Index: gnome-session-2.28.0/gnome-session/gsm-util.h
+===================================================================
+--- gnome-session-2.28.0.orig/gnome-session/gsm-util.h 2010-01-30 14:56:30.509873571 +0100
++++ gnome-session-2.28.0/gnome-session/gsm-util.h 2010-01-30 15:09:37.550373680 +0100
+@@ -29,6 +29,8 @@ char * gsm_util_find_desktop_file_f
+
+ gchar *gsm_util_get_empty_tmp_session_dir (void);
+
++void gsm_util_set_saved_session_dirname (const char * dirname);
++
+ const char *gsm_util_get_saved_session_dir (void);
+
+ gchar** gsm_util_get_app_dirs (void);
+Index: gnome-session-2.28.0/gnome-session/main.c
+===================================================================
+--- gnome-session-2.28.0.orig/gnome-session/main.c 2010-01-30 14:56:25.649872499 +0100
++++ gnome-session-2.28.0/gnome-session/main.c 2010-01-30 15:43:42.965867538 +0100
+@@ -429,9 +429,11 @@ main (int argc, char **argv)
+ GdmSignalHandler *signal_handler;
+ static char **override_autostart_dirs = NULL;
+ static char *default_session_key = NULL;
++ static char *saved_session_name = NULL;
+ static GOptionEntry entries[] = {
+ { "autostart", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &override_autostart_dirs, N_("Override standard autostart directories"), NULL },
+ { "default-session-key", 0, 0, G_OPTION_ARG_STRING, &default_session_key, N_("GConf key used to lookup default session"), NULL },
++ { "saved-session", 0, 0, G_OPTION_ARG_STRING, &saved_session_name, N_("Override name of the saved session")},
+ { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
+ { "failsafe", 'f', 0, G_OPTION_ARG_NONE, &failsafe, N_("Do not load user-specified applications"), NULL },
+ { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL },
+@@ -466,6 +468,9 @@ main (int argc, char **argv)
+ g_print ("%s %s\n", argv [0], VERSION);
+ exit (1);
+ }
++ if (! IS_STRING_EMPTY (saved_session_name)) {
++ gsm_util_set_saved_session_dirname (saved_session_name);
++ }
+
+ gdm_log_init ();
+ gdm_log_set_debug (debug);
Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,4 +1,5 @@
01_gnome-wm.patch
03_devicekit_optional.patch
10_session_save.patch
+11_saved_session_name.patch
90_relibtoolize.patch
Modified: desktop/unstable/gnome-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/rules?rev=22920&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/rules [utf-8] Sat Jan 30 15:19:30 2010
@@ -14,3 +14,10 @@
--with-default-wm=gnome-wm
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+# Build desktop file for gnome3-session
+%.desktop: %.desktop.in
+ intltool-merge -d po $< $@
+build/gnome3-session:: debian/gnome3.desktop
+clean::
+ rm -f debian/gnome3.desktop
Added: desktop/unstable/gnome-session/debian/scripts/gnome3-session
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/scripts/gnome3-session?rev=22920&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/scripts/gnome3-session (added)
+++ desktop/unstable/gnome-session/debian/scripts/gnome3-session [utf-8] Sat Jan 30 15:19:30 2010
@@ -1,0 +1,6 @@
+#! /bin/sh
+
+exec gnome-session \
+ --default-session-key /desktop/gnome/session/default_session3 \
+ --saved-session saved-session3 \
+ "$@"
More information about the pkg-gnome-commits
mailing list