Last commit made on 2011-04-26
Get this branch:
git clone -b ubuntu/natty-devel https://git.launchpad.net/ubuntu/+source/gnome-session
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

6ff0fd2... by Didier Roche on 2011-04-26

Import patches-unapplied version 2.32.1-0ubuntu20 to ubuntu/natty-proposed

Imported using git-ubuntu import.

Changelog parent: 9a48c74642905a2954cb8c0895551fb8166f279a

New changelog entries:
  * debian/patches/02_add_ubuntu_session.patch,
    - load the fallback message with the right locale (LP: #758621)

9a48c74... by Sebastien Bacher on 2011-04-05

Import patches-unapplied version 2.32.1-0ubuntu19 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 7e87e2f52e5b97ca7be8cba83a8d654cd10936a5

New changelog entries:
  * debian/patches/05_enhance_fallback_mode.patch:
    - initialize the fallback message variable to null so it's not freed in
      the livecd case where no fallback message is displayed
      (lp: #751394)

7e87e2f... by Didier Roche on 2011-04-04

Import patches-unapplied version 2.32.1-0ubuntu18 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 964eeaea507c989a87fa80165f5df63dc7f445be

New changelog entries:
  * debian/patches/05_enhance_fallback_mode.patch:
    - fix suffix about the Fallback message to suit our .session file
      (LP: #746266)
    - don't show the message on live session

964eeae... by Didier Roche on 2011-03-23

Import patches-unapplied version 2.32.1-0ubuntu17 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: dfc97966c0a5d43eb9937eb84b08848da9bffe5e

New changelog entries:
  * Rename ubuntu desktop edition to ubuntu and ubuntu classic desktop to
    ubuntu classic

dfc9796... by Sebastien Bacher on 2011-03-18

Import patches-unapplied version 2.32.1-0ubuntu16 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: f09b9be01fdbc0370345db701ca9c64d7d6c157c

New changelog entries:

  [ Gunnar Hjalmarsson ]
  * debian/patches/12_add_gnome-2d_session.patch:
    - Ambigous label in GDM's session chooser modified. Thanks to
      Wayne Davison (LP: #730382).
  [ Didier Roche ]
  * debian/patches/11_add_failsafe_option.patch:
    Make gnome-classic fallbacking in gnome-2d if unity-support-test --compiz
    tells it can't run compiz
  [ Sebastien Bacher ]
  * debian/patches/98_git_session_dialog.patch:
    - set a better default geometry for the gnome-session-properties dialog
      thanks Nico van der Walt for suggesting a patch for it (lp: #728788)

f09b9be... by Ken VanDine on 2011-02-10

Import patches-unapplied version 2.32.1-0ubuntu15 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 260d8091bfe4a343883adeadfcdb11f76c1bcdc0

New changelog entries:
  * debian/patches/81_restart_string_on_inhibit.patch
    - Replaced "Reboot Anyway" with "Restart Anyway",
      thanks Chris Wilson (LP:#685050)
  * debian/po-up/POTFILES.in
    - Replaced non-existing 10_session_save.patch with

260d809... by Didier Roche on 2011-02-03

Import patches-unapplied version 2.32.1-0ubuntu14 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: b344fc08069c850db8acb352c64c928e367daa01

New changelog entries:
  * debian/patches/02_add_ubuntu_session.patch:
    - add a better wording (LP: #712091)
  * debian/control.in:
    - recommends unity-2d as a gnome-panel | unity alternative (LP: #708928)
  * debian/patches/05_enhance_fallback_mode.patch:
    - change the multi-fallback handling, now a list of key in the keyfile is
      provided to FallbackSessionsID. If the fallback is found, the matching
      <keyname>_Message will be displayed if exists. (LP: #704409)
    - don't show "change user session" for now has gnome-control-center with
      that option won't be ready for natty (LP: #711920)
    - adapt the gnome session to the new format (LP: #707232)
  * debian/patches/02_add_ubuntu_session.patch:
    - adapt to new format
    - set ubuntu as the default session if no argument is given

b344fc0... by Didier Roche on 2011-01-26

Import patches-unapplied version 2.32.1-0ubuntu13 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: a3243e9d53df39fd46bc6e28924134f7e65f602f

New changelog entries:
  * debian/patches/04_increase_helper_timeout.patch:
    - increase the timeout to the insane value of 5s to avoid false positive.
      The unity detection plugin needs a real fix to lower its deps
      (LP: #704883)
  * debian/patches/06_nuke_session_saving.patch:
    - as we only have one tab now, don't show it.

a3243e9... by Didier Roche on 2011-01-18

Import patches-unapplied version 2.32.1-0ubuntu12 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 6d31a73102b05df386e3012700eff7387c78c223

New changelog entries:
  * debian/patches/05_show_message_if_fallback.patch =>
    - now support multiple fallbacks. It will pick the first valid one.
      show the corresponding fallback message if needed.
  * debian/patches/02_add_ubuntu_session.patch: (LP: #703653)
    - the ubuntu session has now two fallbacks:
      + unity-2d (2d-ubuntu) for launching the 2d version of unity without any
        warning message if present.
      + gnome-classic (classic-gnome), launching the classic gnome shell
        (panels) with a warning message about the different user experience.

6d31a73... by Didier Roche on 2011-01-16

Import patches-unapplied version 2.32.1-0ubuntu11 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 4da0aa2b7b76f110a225c55b601e85ba9808338d

New changelog entries:
  * debian/patches/02_add_ubuntu_session.patch:
    - fix some typos.
  * debian/patches/03_no_required_component_saved_in_main_session.patch
    debian/patches/10_session_save.patch (removed)
    debian/patches/06_nuke_session_saving.patch: (added)
    - remove saved session handling: it's broken right now with multiple
      sessions and should get a proper upstream refactoring (discussions still
    - remove the option in the gnome-session-properties as well