~ken-vandine/gdm/ubuntu_transition_from_lightdm

« back to all changes in this revision

Viewing changes to debian/gdm.upstart

  • Committer: Martin Pitt
  • Date: 2012-01-31 16:45:10 UTC
  • mfrom: (395.1.1 gdm-3.0.4)
  • Revision ID: martin.pitt@canonical.com-20120131164510-5nynyq179i2kee2v
* debian/patches/45_time_display_on_greeter.patch:
  - Adapt to forwarded version of the patch.
  - Let the LANG environment variable serve as fallback when
    determining the display language for the weekday, since LANG
    has been redefined in Ubuntu to represent language instead of
    regional formats. This change also ought to make the patch work
    as intended upstream.
* debian/gdm.upstart:
  - No need to export LC_MESSAGES since it's not set any longer.
* debian/patches/ubuntu_no_LANG_setting_in_Xsession.patch:
  - Renamed from "ubuntu_i18n_oneiric.patch".
  - No need to unset LC_MESSAGES etc. since they are not set any
    longer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
 
41
41
    if [ -r /etc/default/locale ]; then
42
42
        . /etc/default/locale
43
 
        export LANG LANGUAGE LC_MESSAGES
 
43
        export LANG LANGUAGE
44
44
    elif [ -r /etc/environment ]; then
45
45
        . /etc/environment
46
 
        export LANG LANGUAGE LC_MESSAGES
 
46
        export LANG LANGUAGE
47
47
    fi
48
48
    export XORGCONFIG
49
49