gnome3-team team mailing list archive
-
gnome3-team team
-
Mailing list archive
-
Message #00235
[Merge] lp:~jbicha/gnome-session/gnome3-support-ubuntu-session into lp:~gnome3-team/gnome-session/ubuntu
Jeremy Bicha has proposed merging lp:~jbicha/gnome-session/gnome3-support-ubuntu-session into lp:~gnome3-team/gnome-session/ubuntu.
Requested reviews:
GNOME3 Team (gnome3-team)
For more details, see:
https://code.launchpad.net/~jbicha/gnome-session/gnome3-support-ubuntu-session/+merge/59886
Since our last PPA upload failed because of a build-dep problem, I looked at Debian's packaging which happened to have the dependencies figured out. So I merged in Debian's changes.
--
https://code.launchpad.net/~jbicha/gnome-session/gnome3-support-ubuntu-session/+merge/59886
Your team GNOME3 Team is requested to review the proposed merge of lp:~jbicha/gnome-session/gnome3-support-ubuntu-session into lp:~gnome3-team/gnome-session/ubuntu.
=== modified file 'debian/55gnome-session_gnomerc'
--- debian/55gnome-session_gnomerc 2011-03-30 10:27:45 +0000
+++ debian/55gnome-session_gnomerc 2011-05-04 09:07:07 +0000
@@ -5,7 +5,7 @@
BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
fi
case "$BASESTARTUP" in
- gnome-session|gnome3-session)
+ gnome-session*)
GNOMERC=$HOME/.gnomerc
if [ -r "$GNOMERC" ]; then
. "$GNOMERC"
=== modified file 'debian/README.Debian'
--- debian/README.Debian 2010-06-04 04:49:51 +0000
+++ debian/README.Debian 2011-05-04 09:07:07 +0000
@@ -1,6 +1,31 @@
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 file 'debian/changelog'
--- debian/changelog 2011-05-01 09:12:56 +0000
+++ debian/changelog 2011-05-04 09:07:07 +0000
@@ -1,3 +1,29 @@
+gnome-session (3.0.0-2ubuntu1~build1) natty; urgency=low
+
+ * Merge from Debian experimental, Ubuntu changes:
+ * debian/control.in:
+ - Add Vcs-Bzr link
+ - Suggest gnome-shell and gnome-fallback-session instead of recommend
+ - Modify Replaces line to properly upgrade Ubuntu
+ * debian/gnome-session-common.install:
+ * debian/gnome-session-common.links:
+ - Don't install /etc/gnome/defaults.list - this is installed
+ by desktop-file-utils on Ubuntu.
+ * debian/gnome-session.prerm
+ -remove 55gnome-session_gnomerc so upgrade works with packaging reshuffling
+ * debian/gnome-session-fallback.install
+ - Added fallback with compiz
+ * debian/patches/02_add_ubuntu_session.patch
+ - Used upstream fallback session and added fallback with compiz session
+ for Ubuntu Classic
+ - Added content from 12_add_gnome-2d_session.patch
+ * debian/patches/12_add_gnome-2d_session
+ (removed)
+ * debian/watch:
+ - Watch unstable series
+
+ -- Jeremy Bicha <jeremy@xxxxxxxxx> Wed, 04 May 2011 04:26:45 -0400
+
gnome-session (3.0.0-0ubuntu1~build2) natty; urgency=low
* debian/patches/02_add_ubuntu_session.patch
=== modified file 'debian/control'
--- debian/control 2011-04-04 10:38:54 +0000
+++ debian/control 2011-05-04 09:07:07 +0000
@@ -6,7 +6,8 @@
Source: gnome-session
Section: gnome
Priority: optional
-Maintainer: Josselin Mouette <joss@xxxxxxxxxx>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>
+XSBC-Original-Maintainer: Josselin Mouette <joss@xxxxxxxxxx>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@xxxxxxxxxxxxxxxxxxxxxxx>, Emilio Pozuelo Monfort <pochu@xxxxxxxxxx>, Frederic Peters <fpeters@xxxxxxxxxx>, Michael Biebl <biebl@xxxxxxxxxx>
Standards-Version: 3.9.0
Build-Depends: cdbs (>= 0.4.41),
@@ -15,71 +16,117 @@
gnome-pkg-tools (>= 0.13),
gnome-common,
intltool (>= 0.40.0),
- libglib2.0-dev (>= 2.16.0),
- libgtk-3-dev (>= 3.0.0),
+ libglib2.0-dev (>= 2.28.0),
+ libgtk-3-dev (>= 2.90.7),
libupower-glib-dev (>= 0.9.0),
libdbus-glib-1-dev (>= 0.76),
libgconf2-dev (>= 2.10.1-6),
librsvg2-dev,
- libstartup-notification0-dev,
libsm-dev,
libice-dev,
libx11-dev,
libxt-dev,
libxau-dev,
libxext-dev,
+ libxcomposite-dev,
+ libgl1-mesa-dev,
libxtst-dev,
libxrender-dev,
xmlto,
- xsltproc
+ xsltproc,
+ xtrans-dev
Package: gnome-session
Architecture: all
Depends: ${misc:Depends},
- gnome-settings-daemon,
- gnome-shell,
- nautilus (>= 2.26),
+ gnome-settings-daemon (>= 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.91)
-Replaces: gnome-session-common (<< 2.91.91.3-1),
+ gnome-session-bin (<< ${gnome:NextVersion}),
+ gnome-session-common (= ${binary:Version})
+Recommends: gnome-power-manager,
+ notification-daemon
+Suggests: gnome-user-guide,
+ desktop-base,
+ gnome-session-fallback,
+ gnome-shell (>= 3.0),
+ gnome-keyring
+Replaces: gnome-session-bin (<<= 3.0.0-0ubuntu1),
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.0-0ubuntu1),
+ gnome-session-bin (<<= 3.0.0-0ubuntu1)
+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.0-0ubuntu1),
+ gnome-session-bin (<<= 3.0.0-0ubuntu1),
+ 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 file 'debian/control.in'
--- debian/control.in 2011-04-04 10:38:54 +0000
+++ debian/control.in 2011-05-04 09:07:07 +0000
@@ -1,8 +1,9 @@
Source: gnome-session
Section: gnome
Priority: optional
-Maintainer: Josselin Mouette <joss@xxxxxxxxxx>
-Uploaders: @GNOME_TEAM@
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>
+XSBC-Original-Maintainer: Josselin Mouette <joss@xxxxxxxxxx>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@xxxxxxxxxxxxxxxxxxxxxxx>, Emilio Pozuelo Monfort <pochu@xxxxxxxxxx>, Frederic Peters <fpeters@xxxxxxxxxx>, Michael Biebl <biebl@xxxxxxxxxx>
Standards-Version: 3.9.0
Build-Depends: cdbs (>= 0.4.41),
dh-autoreconf,
@@ -10,71 +11,117 @@
gnome-pkg-tools (>= 0.13),
gnome-common,
intltool (>= 0.40.0),
- libglib2.0-dev (>= 2.16.0),
- libgtk-3-dev (>= 3.0.0),
+ libglib2.0-dev (>= 2.28.0),
+ libgtk-3-dev (>= 2.90.7),
libupower-glib-dev (>= 0.9.0),
libdbus-glib-1-dev (>= 0.76),
libgconf2-dev (>= 2.10.1-6),
librsvg2-dev,
- libstartup-notification0-dev,
libsm-dev,
libice-dev,
libx11-dev,
libxt-dev,
libxau-dev,
libxext-dev,
+ libxcomposite-dev,
+ libgl1-mesa-dev,
libxtst-dev,
libxrender-dev,
xmlto,
- xsltproc
+ xsltproc,
+ xtrans-dev
Package: gnome-session
Architecture: all
Depends: ${misc:Depends},
- gnome-settings-daemon,
- gnome-shell,
- nautilus (>= 2.26),
+ gnome-settings-daemon (>= 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.91)
-Replaces: gnome-session-common (<< 2.91.91.3-1),
+ gnome-session-bin (<< ${gnome:NextVersion}),
+ gnome-session-common (= ${binary:Version})
+Recommends: gnome-power-manager,
+ notification-daemon
+Suggests: gnome-user-guide,
+ desktop-base,
+ gnome-session-fallback,
+ gnome-shell (>= 3.0),
+ gnome-keyring
+Replaces: gnome-session-bin (<= 3.0.0-0ubuntu1),
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.0-0ubuntu1),
+ gnome-session-bin (<= 3.0.0-0ubuntu1)
+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.0-0ubuntu1),
+ gnome-session-bin (<= 3.0.0-0ubuntu1),
+ 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.
=== removed file 'debian/gnome-session-bin.gconf-defaults'
--- debian/gnome-session-bin.gconf-defaults 2009-07-29 22:39:10 +0000
+++ debian/gnome-session-bin.gconf-defaults 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/desktop/gnome/session/required_components/windowmanager gnome-wm
=== modified file 'debian/gnome-session-bin.install'
--- debian/gnome-session-bin.install 2011-03-30 10:27:45 +0000
+++ debian/gnome-session-bin.install 2011-05-04 09:07:07 +0000
@@ -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 file 'debian/gnome-session-common.dirs'
--- debian/gnome-session-common.dirs 1970-01-01 00:00:00 +0000
+++ debian/gnome-session-common.dirs 2011-05-04 09:07:07 +0000
@@ -0,0 +1,1 @@
+usr/share/gnome/applications
=== added file 'debian/gnome-session-common.install'
--- debian/gnome-session-common.install 1970-01-01 00:00:00 +0000
+++ debian/gnome-session-common.install 2011-05-04 09:07:07 +0000
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
+debian/55gnome-session_gnomerc etc/X11/Xsession.d
=== added file 'debian/gnome-session-fallback.install'
--- debian/gnome-session-fallback.install 1970-01-01 00:00:00 +0000
+++ debian/gnome-session-fallback.install 2011-05-04 09:07:07 +0000
@@ -0,0 +1,7 @@
+debian/scripts/gnome-session-fallback /usr/bin
+debian/scripts/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
+debian/tmp/usr/share/xsessions/gnome-fallback-compiz.desktop
+debian/tmp/usr/share/gnome-session/sessions/gnome-fallback-compiz.session
=== removed file 'debian/gnome-session.dirs'
--- debian/gnome-session.dirs 2011-03-30 10:27:45 +0000
+++ debian/gnome-session.dirs 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/gnome/applications
=== modified file 'debian/gnome-session.install'
--- debian/gnome-session.install 2011-04-04 10:38:54 +0000
+++ debian/gnome-session.install 2011-05-04 09:07:07 +0000
@@ -1,5 +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/tmp/usr/share/xsessions/gnome.desktop
+debian/tmp/usr/share/gnome-session/sessions/gnome.session
=== modified file 'debian/gnome-session.postinst'
--- debian/gnome-session.postinst 2010-06-04 04:49:51 +0000
+++ debian/gnome-session.postinst 2011-05-04 09:07:07 +0000
@@ -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 file 'debian/gnome-wm.desktop'
--- debian/gnome-wm.desktop 1970-01-01 00:00:00 +0000
+++ debian/gnome-wm.desktop 2011-05-04 09:07:07 +0000
@@ -0,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@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@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@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@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@cyrillic]=Ойна бошқарувчиÑи
+Name[vi]=Bá»™ quản lý cá»a sổ
+Name[wa]=Manaedjeu di purneas
+Name[xh]=Umlawuli Wefestile
+Name[yo]=AlaÌboÌ€oÌjuÌtoÌ FeÌ€reÌ€seÌ
+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
=== modified file 'debian/patches/01_gnome-wm.patch'
--- debian/patches/01_gnome-wm.patch 2011-03-30 10:27:45 +0000
+++ debian/patches/01_gnome-wm.patch 2011-05-04 09:07:07 +0000
@@ -1,95 +1,11 @@
-Index: gnome-session-2.28.0/data/gnome-wm
+Index: gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in
===================================================================
---- gnome-session-2.28.0.orig/data/gnome-wm 2009-07-29 02:36:07.000000000 +0200
-+++ gnome-session-2.28.0/data/gnome-wm 2009-11-16 15:19:11.298109473 +0100
-@@ -40,11 +40,6 @@ for n in "$@" ; do
- esac
- done
-
--# WINDOW_MANAGER overrides all
--if [ -z "$WINDOW_MANAGER" ] ; then
-- WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required_components/windowmanager 2> /dev/null`
--fi
--
- # Migrate compiz to compiz-manager if possible and needed
- if [ "x$WINDOW_MANAGER" = "xcompiz" -o "x$DEFWM" = "xcompiz" ]; then
- which compiz-manager > /dev/null 2>&1
-@@ -68,41 +63,21 @@ 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
-
-- xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
-- IS_X_COMPOSITED=$?
--
-- KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
-- if [ $IS_X_COMPOSITED -eq 0 ] ; then
-- KNOWN_WM="mutter compiz-manager compiz beryl $KNOWN_WM"
-- fi
-- # metacity is still the default wm in GNOME
-- KNOWN_WM="metacity $KNOWN_WM"
--
-- OLDIFS=$IFS
-- if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then
-+ KNOWN_WM="metacity mutter sawfish"
-
-- for wm in $KNOWN_WM ; do
-- IFS=":"
-- for dir in $PATH ; do
-- if [ -x "$dir/$wm" ] ; then
-- WINDOW_MANAGER="$dir/$wm"
-- break 2
-- fi
-- done
-- IFS=$OLDIFS
-- done
-+ for wm in $KNOWN_WM; do
-+ if [ -x /usr/bin/"$wm" ]; then
-+ WINDOW_MANAGER=/usr/bin/"$wm"
-+ break
-+ fi
-+ done
-
-- else
-- WINDOW_MANAGER=$DEFWM
-- fi
-- IFS=$OLDIFS
- fi
-
--# If no window manager can be found, we default to xterm
-+# Look for the default window manager on the system
-
- if [ -z "$WINDOW_MANAGER" ] ; then
-- echo "WARNING: No window manager can be found."
-- WINDOW_MANAGER=xterm
-+ WINDOW_MANAGER=$(readlink /etc/alternatives/x-window-manager 2>/dev/null)
- fi
-
- # Now create options OPT1, OPT2 and OPT3 based on the windowmanager used
-@@ -127,7 +102,7 @@ if [ ! -z "$SMID" ] ; then
- OPT1=-s
- OPT2=$SMID
- ;;
-- fvwm)
-+ fvwm|fvwm2)
- OPT1=-i
- OPT2=$SMID
- ;;
-@@ -145,9 +120,8 @@ fi
-
- case `basename $WINDOW_MANAGER` in
- compiz)
-- export LIBGL_ALWAYS_INDIRECT=1
- gtk-window-decorator &
-- OPT3=glib
-+ #OPT3=glib
- OPT4=gconf
- ;;
- beryl)
-@@ -155,6 +129,6 @@ case `basename $WINDOW_MANAGER` in
- ;;
- esac
-
--exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
-+exec "$WINDOW_MANAGER" $OPT1 $OPT2 $OPT3 $OPT4
-
- echo "ERROR: No window manager could run!"
+--- 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
=== modified file 'debian/patches/02_add_ubuntu_session.patch'
--- debian/patches/02_add_ubuntu_session.patch 2011-05-02 06:54:13 +0000
+++ debian/patches/02_add_ubuntu_session.patch 2011-05-04 09:07:07 +0000
@@ -1,7 +1,7 @@
Index: gnome-session-3.0.0/data/ubuntu.session.desktop.in.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.0.0/data/ubuntu.session.desktop.in.in 2011-05-02 02:52:17.085079198 -0400
++++ gnome-session-3.0.0/data/ubuntu.session.desktop.in.in 2011-05-04 04:09:27.548206739 -0400
@@ -0,0 +1,11 @@
+[GNOME Session]
+_Name=Ubuntu
@@ -12,18 +12,58 @@
+IsRunnableHelper=/usr/lib/nux/unity_support_test
+FallbackSessionsID=FallbackUnity2d;FallbackClassicGnome
+FallbackUnity2d=2d-ubuntu
-+FallbackClassicGnome=classic-gnome
++FallbackClassicGnome=gnome-fallback
+_FallbackClassicGnomeMessage=It seems that you do not have the hardware required to run Unity. Please choose Ubuntu Classic at the login screen and you will be using the traditional environment.
+Index: gnome-session-3.0.0/data/gnome.desktop.in
+===================================================================
+--- gnome-session-3.0.0.orig/data/gnome.desktop.in 2010-02-09 08:22:01.000000000 -0500
++++ gnome-session-3.0.0/data/gnome.desktop.in 2011-05-04 04:09:27.548206739 -0400
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+-_Name=GNOME
+-_Comment=This session logs you into GNOME
+-Exec=gnome-session
++_Name=Ubuntu
++_Comment=This session logs you into Ubuntu
++Exec=gnome-session --session=ubuntu
+ TryExec=gnome-session
+ Icon=
+ Type=Application
+Index: gnome-session-3.0.0/data/gnome-fallback-compiz.desktop.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-session-3.0.0/data/gnome-fallback-compiz.desktop.in 2011-05-04 04:10:06.359452901 -0400
+@@ -0,0 +1,7 @@
++[Desktop Entry]
++_Name=Ubuntu Classic
++_Comment=This session logs you into GNOME with the traditional panel with 3D effects.
++Exec=gnome-session --session=gnome-fallback-compiz
++TryExec=gnome-session
++Icon=
++Type=Application
+Index: gnome-session-3.0.0/data/gnome-fallback.desktop.in
+===================================================================
+--- gnome-session-3.0.0.orig/data/gnome-fallback.desktop.in 2011-05-04 04:09:25.798150504 -0400
++++ gnome-session-3.0.0/data/gnome-fallback.desktop.in 2011-05-04 04:09:27.608208675 -0400
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+-_Name=GNOME fallback
+-_Comment=This session logs you into GNOME
++_Name=Ubuntu Classic (No Effects)
++_Comment=This session logs you into GNOME with the traditional panel without any 3D effects.
+ Exec=gnome-session-fallback
+ TryExec=gnome-session
+ Icon=
Index: gnome-session-3.0.0/data/Makefile.am
===================================================================
---- gnome-session-3.0.0.orig/data/Makefile.am 2011-03-22 16:31:42.000000000 -0400
-+++ gnome-session-3.0.0/data/Makefile.am 2011-05-02 02:53:25.646512723 -0400
+--- gnome-session-3.0.0.orig/data/Makefile.am 2011-05-04 04:09:25.798150504 -0400
++++ gnome-session-3.0.0/data/Makefile.am 2011-05-04 04:09:27.608208675 -0400
@@ -6,7 +6,7 @@
gsm-inhibit-dialog.ui
xsessiondir = $(datadir)/xsessions
--xsession_in_files = gnome.desktop.in
-+xsession_in_files = gnome.desktop.in gnome-classic.desktop.in
+-xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in
++xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in gnome-fallback-compiz.desktop.in
xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
desktopdir = $(datadir)/applications
@@ -32,45 +72,37 @@
sessiondir = $(datadir)/gnome-session/sessions
-session_in_in_files = gnome.session.desktop.in.in gnome-fallback.session.desktop.in.in
-+session_in_in_files = gnome.session.desktop.in.in gnome-fallback.session.desktop.in.in ubuntu.session.desktop.in.in
++session_in_in_files = gnome.session.desktop.in.in gnome-fallback.session.desktop.in.in gnome-fallback-compiz.session.desktop.in.in ubuntu.session.desktop.in.in
session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
session_DATA = $(session_in_files:.session.desktop.in=.session)
-Index: gnome-session-3.0.0/data/gnome-classic.desktop.in
+Index: gnome-session-3.0.0/data/gnome-fallback-compiz.session.desktop.in.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.0.0/data/gnome-classic.desktop.in 2011-05-02 02:51:33.634170879 -0400
++++ gnome-session-3.0.0/data/gnome-fallback-compiz.session.desktop.in.in 2011-05-04 04:10:37.060437377 -0400
@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+_Name=Ubuntu Classic
-+_Comment=This session logs you into GNOME with the traditional panel
-+Exec=gnome-session --session=classic-gnome
-+TryExec=gnome-session
-+Icon=
-+Type=Application
-Index: gnome-session-3.0.0/data/gnome.desktop.in
-===================================================================
---- gnome-session-3.0.0.orig/data/gnome.desktop.in 2010-02-09 08:22:01.000000000 -0500
-+++ gnome-session-3.0.0/data/gnome.desktop.in 2011-05-02 02:51:33.634170879 -0400
-@@ -1,7 +1,7 @@
- [Desktop Entry]
--_Name=GNOME
--_Comment=This session logs you into GNOME
--Exec=gnome-session
-+_Name=Ubuntu
-+_Comment=This session logs you into Ubuntu
-+Exec=gnome-session --session=ubuntu
- TryExec=gnome-session
- Icon=
- Type=Application
++[GNOME Session]
++_Name=GNOME fallback compiz
++RequiredComponents=gnome-settings-daemon;
++RequiredProviders=windowmanager;panel
++DefaultProvider-windowmanager=compiz
++DefaultProvider-panel=gnome-panel
++DefaultProvider-notifications=notification-daemon
Index: gnome-session-3.0.0/po/POTFILES.in
===================================================================
--- gnome-session-3.0.0.orig/po/POTFILES.in 2011-03-22 16:31:43.000000000 -0400
-+++ gnome-session-3.0.0/po/POTFILES.in 2011-05-02 02:53:25.606511886 -0400
-@@ -7,6 +7,7 @@
++++ gnome-session-3.0.0/po/POTFILES.in 2011-05-04 04:09:27.618208993 -0400
+@@ -4,9 +4,13 @@
+ capplet/gsm-properties-dialog.c
+ capplet/gsp-app.c
+ capplet/main.c
++data/gnome-fallback-compiz.desktop.in
++data/gnome-fallback-compiz.session.desktop.in.in
++data/gnome-fallback.desktop.in
data/gnome-fallback.session.desktop.in.in
- data/gnome.session.desktop.in.in
+-data/gnome.session.desktop.in.in
data/gnome.desktop.in
++data/gnome.session.desktop.in.in
+data/ubuntu.session.desktop.in.in
[type: gettext/glade]data/gsm-inhibit-dialog.ui
data/session-properties.desktop.in.in
=== added file 'debian/patches/02_fallback_desktop.patch'
--- debian/patches/02_fallback_desktop.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/02_fallback_desktop.patch 2011-05-04 09:07:07 +0000
@@ -0,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-fallback
++TryExec=gnome-session
++Icon=
++Type=Application
=== removed file 'debian/patches/02_no_warning_crash.patch'
--- debian/patches/02_no_warning_crash.patch 2009-05-04 21:20:37 +0000
+++ debian/patches/02_no_warning_crash.patch 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' gnome-session-2.20.1/gnome-session/main.c gnome-session-2.20.1.new/gnome-session/main.c
---- gnome-session-2.20.1/gnome-session/main.c 2007-11-21 15:48:32.000000000 +0100
-+++ gnome-session-2.20.1.new/gnome-session/main.c 2007-11-21 15:49:01.000000000 +0100
-@@ -593,6 +593,7 @@
- gsm_set_verbose (TRUE);
-
- /* Help eradicate the critical warnings in unstable releases of GNOME */
-+ /*
- versions = g_strsplit (VERSION, ".", 3);
- if (versions && versions [0] && versions [1])
- {
-@@ -605,7 +606,7 @@
- }
- }
- g_strfreev (versions);
--
-+ */
- set_gtk1_theme_rcfile ();
-
- /* Initialize the i18n stuff */
=== modified file 'debian/patches/10_session_save.patch'
--- debian/patches/10_session_save.patch 2011-03-30 10:27:45 +0000
+++ debian/patches/10_session_save.patch 2011-05-04 09:07:07 +0000
@@ -1,18 +1,18 @@
Based on the patch in GNOME #575544
-Index: gnome-session-2.91.91.3/gnome-session/gsm-manager.c
+Index: gnome-session-3.0.0/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 */
+--- 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
+Index: gnome-session-3.0.0/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 @@
+--- 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
+Index: gnome-session-3.0.0/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 @@
+--- 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
+Index: gnome-session-3.0.0/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 @@
+--- 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
+Index: gnome-session-3.0.0/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
+--- 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
+Index: gnome-session-3.0.0/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
+--- 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
+Index: gnome-session-3.0.0/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 @@
+--- 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
+Index: gnome-session-3.0.0/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 @@
+--- 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
+Index: gnome-session-3.0.0/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 @@
+--- 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
+Index: gnome-session-3.0.0/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 @@
+--- 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
+Index: gnome-session-3.0.0/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
+--- 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>
=== removed file 'debian/patches/11_saved_session_name.patch'
--- debian/patches/11_saved_session_name.patch 2011-03-30 10:27:45 +0000
+++ debian/patches/11_saved_session_name.patch 1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-Index: gnome-session-2.91.91.3/gnome-session/gsm-util.c
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-util.c 2010-10-12 17:47:12.000000000 +0200
-+++ gnome-session-2.91.91.3/gnome-session/gsm-util.c 2011-03-14 18:41:34.266303001 +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 @@
- 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 @@
- _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.91.91.3/gnome-session/gsm-util.h
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/gsm-util.h 2010-11-30 08:07:11.000000000 +0100
-+++ gnome-session-2.91.91.3/gnome-session/gsm-util.h 2011-03-14 18:41:34.266303001 +0100
-@@ -31,6 +31,8 @@
-
- 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.91.91.3/gnome-session/main.c
-===================================================================
---- gnome-session-2.91.91.3.orig/gnome-session/main.c 2011-02-26 23:53:37.000000000 +0100
-+++ gnome-session-2.91.91.3/gnome-session/main.c 2011-03-14 18:48:51.882303002 +0100
-@@ -272,9 +272,11 @@
- GdmSignalHandler *signal_handler;
- static char **override_autostart_dirs = NULL;
- static char *session_name = 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 },
- { "session", 0, 0, G_OPTION_ARG_STRING, &session_name, N_("Session to use"), 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 },
-@@ -309,6 +311,9 @@
- 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);
=== removed file 'debian/patches/12_add_gnome-2d_session.patch'
--- debian/patches/12_add_gnome-2d_session.patch 2011-05-02 06:54:13 +0000
+++ debian/patches/12_add_gnome-2d_session.patch 1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-Index: gnome-session-3.0.0/data/gnome-2d.desktop.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.0.0/data/gnome-2d.desktop.in 2011-05-02 02:52:28.705322138 -0400
-@@ -0,0 +1,7 @@
-+[Desktop Entry]
-+_Name=Ubuntu Classic (No effects)
-+_Comment=This session logs you into GNOME with the traditional panel without any 3D effects.
-+Exec=gnome-session --session=2d-gnome
-+TryExec=gnome-session
-+Icon=
-+Type=Application
-Index: gnome-session-3.0.0/data/2d-gnome.session.desktop.in.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.0.0/data/2d-gnome.session.desktop.in.in 2011-05-02 02:53:16.586323269 -0400
-@@ -0,0 +1,7 @@
-+[GNOME Session]
-+_Name=Failsafe GNOME
-+RequiredComponents=gnome-settings-daemon
-+RequiredProviders=windowmanager;panel
-+DefaultProvider-windowmanager=metacity
-+DefaultProvider-panel=gnome-panel
-+FallbackSession=classic-gnome
-Index: gnome-session-3.0.0/data/classic-gnome.session.desktop.in.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-session-3.0.0/data/classic-gnome.session.desktop.in.in 2011-05-02 02:52:44.225646632 -0400
-@@ -0,0 +1,6 @@
-+[GNOME Session]
-+_Name=Classic GNOME
-+RequiredComponents=gnome-settings-daemon
-+RequiredProviders=windowmanager;panel
-+DefaultProvider-windowmanager=compiz
-+DefaultProvider-panel=gnome-panel
-Index: gnome-session-3.0.0/data/Makefile.am
-===================================================================
---- gnome-session-3.0.0.orig/data/Makefile.am 2011-05-02 02:51:33.634170879 -0400
-+++ gnome-session-3.0.0/data/Makefile.am 2011-05-02 02:52:28.765323392 -0400
-@@ -6,7 +6,7 @@
- gsm-inhibit-dialog.ui
-
- xsessiondir = $(datadir)/xsessions
--xsession_in_files = gnome.desktop.in gnome-classic.desktop.in
-+xsession_in_files = gnome.desktop.in gnome-classic.desktop.in gnome-2d.desktop.in
- xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
-
- desktopdir = $(datadir)/applications
-@@ -14,7 +14,7 @@
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
- sessiondir = $(datadir)/gnome-session/sessions
--session_in_in_files = gnome.session.desktop.in.in gnome-fallback.session.desktop.in.in ubuntu.session.desktop.in.in
-+session_in_in_files = 2d-gnome.session.desktop.in.in classic-gnome.session.desktop.in.in gnome.session.desktop.in.in gnome-fallback.session.desktop.in.in ubuntu.session.desktop.in.in
- session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
- session_DATA = $(session_in_files:.session.desktop.in=.session)
-
-Index: gnome-session-3.0.0/po/POTFILES.in
-===================================================================
---- gnome-session-3.0.0.orig/po/POTFILES.in 2011-05-02 02:51:33.634170879 -0400
-+++ gnome-session-3.0.0/po/POTFILES.in 2011-05-02 02:52:28.765323392 -0400
-@@ -4,9 +4,12 @@
- capplet/gsm-properties-dialog.c
- capplet/gsp-app.c
- capplet/main.c
-+data/2d-gnome.session.desktop.in.in
-+data/classic-gnome.session.desktop.in.in
-+data/gnome-2d.desktop.in
- data/gnome-fallback.session.desktop.in.in
--data/gnome.session.desktop.in.in
- data/gnome.desktop.in
-+data/gnome.session.desktop.in.in
- data/ubuntu.session.desktop.in.in
- [type: gettext/glade]data/gsm-inhibit-dialog.ui
- data/session-properties.desktop.in.in
=== modified file 'debian/patches/13_no_fallback_notification.patch'
--- debian/patches/13_no_fallback_notification.patch 2011-03-30 10:27:45 +0000
+++ debian/patches/13_no_fallback_notification.patch 2011-05-04 09:07:07 +0000
@@ -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 file 'debian/patches/series'
--- debian/patches/series 2011-04-14 18:44:55 +0000
+++ debian/patches/series 2011-05-04 09:07:07 +0000
@@ -1,12 +1,11 @@
-#01_gnome-wm.patch
+01_gnome-wm.patch
+02_fallback_desktop.patch
02_add_ubuntu_session.patch
#05_enhance_fallback_mode.patch
#06_nuke_session_saving.patch
#10_session_save.patch
+#11_add_failsafe_option.patch
12_no_gdm_fallback.patch
-#11_add_failsafe_option.patch
-11_saved_session_name.patch
-12_add_gnome-2d_session.patch
13_no_fallback_notification.patch
#19_gnome-wm-tweaking.patch
#20_hide_nodisplay.patch
=== added directory 'debian/scripts'
=== added file 'debian/scripts/gnome-session-fallback'
--- debian/scripts/gnome-session-fallback 1970-01-01 00:00:00 +0000
+++ debian/scripts/gnome-session-fallback 2011-05-04 09:07:07 +0000
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec gnome-session --session gnome-fallback "$@"
=== added file 'debian/scripts/gnome-wm'
--- debian/scripts/gnome-wm 1970-01-01 00:00:00 +0000
+++ debian/scripts/gnome-wm 2011-05-04 09:07:07 +0000
@@ -0,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!"
Follow ups
