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/57751 -- https://code.launchpad.net/~jbicha/gnome-session/gnome3-support-ubuntu-session/+merge/57751 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/changelog' --- debian/changelog 2011-04-06 15:29:11 +0000 +++ debian/changelog 2011-04-14 18:36:36 +0000 @@ -1,3 +1,10 @@ +gnome-session (3.0.0-0ubuntu1~build2) natty; urgency=low + + * debian/patches/02_add_ubuntu_session.patch + - Re-enabled support for Ubuntu session + + -- Jeremy Bicha <[email protected]> Wed, 13 Apr 2011 22:44:13 -0400 + gnome-session (3.0.0-0ubuntu1~build1) natty; urgency=low * New upstream release === modified file 'debian/patches/02_add_ubuntu_session.patch' --- debian/patches/02_add_ubuntu_session.patch 2011-03-30 10:27:45 +0000 +++ debian/patches/02_add_ubuntu_session.patch 2011-04-14 18:36:36 +0000 @@ -1,24 +1,23 @@ -Index: gnome-session-2.32.1/data/ubuntu.session.desktop.in.in +Index: gnome-session-3.0.0/data/ubuntu.session.desktop.in.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-session-2.32.1/data/ubuntu.session.desktop.in.in 2011-02-03 14:09:43.344843994 +0100 ++++ gnome-session-3.0.0/data/ubuntu.session.desktop.in.in 2011-04-13 14:09:43.344843994 +0100 @@ -0,0 +1,12 @@ +[GNOME Session] +_Name=Ubuntu -+Required=windowmanager;panel;filemanager; -+Required-windowmanager=compiz -+Required-panel=compiz -+Required-filemanager=nautilus -+DefaultApps=gnome-settings-daemon; ++RequiredComponents=gnome-settings-daemon ++RequiredProviders=windowmanager;panel ++DefaultProvider-windowmanager=compiz ++DefaultProvider-panel=compiz +IsRunnableHelper=/usr/lib/nux/unity_support_test +FallbackSessionsID=FallbackUnity2d;FallbackClassicGnome +FallbackUnity2d=2d-ubuntu +FallbackClassicGnome=classic-gnome +_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-2.32.1/data/Makefile.am +Index: gnome-session-3.0.0/data/Makefile.am =================================================================== ---- gnome-session-2.32.1.orig/data/Makefile.am 2011-02-03 14:09:43.292843747 +0100 -+++ gnome-session-2.32.1/data/Makefile.am 2011-02-03 14:09:43.344843994 +0100 +--- gnome-session--3.0.0.orig/data/Makefile.am 2011-04-13 14:09:43.292843747 +0100 ++++ gnome-session--3.0.0/data/Makefile.am 2011-04-13 14:09:43.344843994 +0100 @@ -8,7 +8,7 @@ gsm-inhibit-dialog.ui @@ -37,10 +36,10 @@ 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-2.32.1/data/gnome-classic.desktop.in +Index: gnome-session-3.0.0/data/gnome-classic.desktop.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-session-2.32.1/data/gnome-classic.desktop.in 2011-02-03 14:09:43.344843994 +0100 ++++ gnome-session-3.0.0/data/gnome-classic.desktop.in 2011-04-13 14:09:43.344843994 +0100 @@ -0,0 +1,7 @@ +[Desktop Entry] +_Name=Ubuntu Classic @@ -49,10 +48,10 @@ +TryExec=gnome-session +Icon= +Type=Application -Index: gnome-session-2.32.1/data/gnome.desktop.in +Index: gnome-session-3.0.0/data/gnome.desktop.in =================================================================== ---- gnome-session-2.32.1.orig/data/gnome.desktop.in 2010-02-09 14:22:01.000000000 +0100 -+++ gnome-session-2.32.1/data/gnome.desktop.in 2011-02-03 14:09:43.344843994 +0100 +--- gnome-session-3.0.0.orig/data/gnome.desktop.in 2010-04-13 14:22:01.000000000 +0100 ++++ gnome-session-3.0.0/data/gnome.desktop.in 2011-04-13 14:09:43.344843994 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] -_Name=GNOME @@ -64,10 +63,10 @@ TryExec=gnome-session Icon= Type=Application -Index: gnome-session-2.32.1/po/POTFILES.in +Index: gnome-session-3.0.0/po/POTFILES.in =================================================================== ---- gnome-session-2.32.1.orig/po/POTFILES.in 2011-02-03 14:09:43.308843826 +0100 -+++ gnome-session-2.32.1/po/POTFILES.in 2011-02-03 14:09:43.348844004 +0100 +--- gnome-session-3.0.0.orig/po/POTFILES.in 2011-04-13 14:09:43.308843826 +0100 ++++ gnome-session--3.0.0/po/POTFILES.in 2011-04-13 14:09:43.348844004 +0100 @@ -7,6 +7,7 @@ data/gnome-fallback.session.desktop.in.in data/gnome.session.desktop.in.in
_______________________________________________ Mailing list: https://launchpad.net/~gnome3-team Post to : [email protected] Unsubscribe : https://launchpad.net/~gnome3-team More help : https://help.launchpad.net/ListHelp
