gdm

Merge lp://staging/~ricotz/gdm/ubuntu into lp://staging/~ubuntu-desktop/gdm/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Rico Tzschichholz
Status: Rejected
Rejected by: Robert Ancell
Proposed branch: lp://staging/~ricotz/gdm/ubuntu
Merge into: lp://staging/~ubuntu-desktop/gdm/ubuntu
Diff against target: 2042 lines (+643/-463)
36 files modified
debian/changelog (+16/-0)
debian/control (+98/-2)
debian/control.in (+98/-1)
debian/gdm-welcome.pam (+10/-0)
debian/gdm.install (+12/-3)
debian/gir1.2-gdmgreeter-1.0.install (+1/-0)
debian/libgdmgreeter-dev.install (+4/-0)
debian/libgdmgreeter1.install (+1/-0)
debian/libgdmsimplegreeter-dev.install (+3/-0)
debian/libgdmsimplegreeter1.install (+2/-0)
debian/patches/00git.diff (+26/-0)
debian/patches/00git_use_new_power_interface.patch (+0/-29)
debian/patches/00git_xsession-errors_symlink.patch (+0/-76)
debian/patches/01_language.patch (+13/-13)
debian/patches/01git.diff (+59/-0)
debian/patches/06_first_vt.patch (+6/-6)
debian/patches/07_libexec-paths.patch (+43/-83)
debian/patches/08_frequent-users_greeter.patch (+5/-5)
debian/patches/15_default_session.patch (+15/-15)
debian/patches/16_xserver_path.patch (+4/-4)
debian/patches/29_grep_path.patch (+0/-13)
debian/patches/29_switch_user.patch (+76/-76)
debian/patches/30_don_t_save_failsafe_session.patch (+31/-31)
debian/patches/42_no_ecryptfs_autologin.patch (+9/-9)
debian/patches/45_time_display_on_greeter.patch (+4/-3)
debian/patches/93_xdg_data_dirs.patch (+6/-6)
debian/patches/series (+6/-7)
debian/patches/ubuntu_dont_catch_sigsegv.patch (+16/-16)
debian/patches/ubuntu_guest_session.patch (+21/-20)
debian/patches/ubuntu_i18n_oneiric.patch (+4/-3)
debian/patches/ubuntu_no_debug.patch (+4/-4)
debian/patches/ubuntu_plymouth.patch (+32/-21)
debian/patches/ubuntu_run_xsession.d.patch (+3/-3)
debian/patches/ubuntu_upstart_event.patch (+6/-6)
debian/patches/ubuntu_xresources_is_a_dir.patch (+4/-2)
debian/rules (+5/-6)
To merge this branch: bzr merge lp://staging/~ricotz/gdm/ubuntu
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+71662@code.staging.launchpad.net

Description of the change

update gdm to 3.1.2

To post a comment you must log in.
lp://staging/~ricotz/gdm/ubuntu updated
383. By Martin Pitt

debian/gdm.prerm: Stop asking for <dm>/daemon_name debconf question, it
does not exist for lightdm and is not really necessary. Fixes prerm error
and confusing debconf prompts when removing gdm. (LP: #804821)

384. By Martin Pitt

releasing version 3.0.4-0ubuntu10

385. By Steve Langasek

 for bug #615549 from maverick without explanation.

386. By Steve Langasek

clean up the completely illegible start rule for debian/gdm.upstart,
killing off the unnecessary parentheses

387. By Steve Langasek

whoops, we do need the outermost parentheses or else upstart can't parse the job

388. By Steve Langasek

debian/gdm.upstart: when gdm is shut down by a runlevel call, emit an
upstart event that can be caught by plymouth so it can distinguish
between the DM shutting down for a runlevel change vs. other causes.
LP: #854329.

389. By Steve Langasek

releasing version 3.0.4-0ubuntu11

390. By Rico Tzschichholz

* New upstream release
* debian/control.in:
  - Add Build-dep on libgirepository1.0-dev (>= 0.9.12),
    gobject-introspection (>= 0.9.12), libnss3-dev (>= 3.11.1)
  - Add gir1.2-gdmgreeter-1.0 libgdmgreeter1, libgdmgreeter-dev,
    libgdmsimplegreeter1, libgdmsimplegreeter-dev packages
* debian/patches:
  - Drop 00git_use_new_power_interface.patch,
    00git_xsession-errors_symlink.patch and 29_grep_path.patch
    which are upstream
  - refreshed as needed

Revision history for this message
Robert Ancell (robert-ancell) wrote :

This is obsolete now...

Unmerged revisions

390. By Rico Tzschichholz

* New upstream release
* debian/control.in:
  - Add Build-dep on libgirepository1.0-dev (>= 0.9.12),
    gobject-introspection (>= 0.9.12), libnss3-dev (>= 3.11.1)
  - Add gir1.2-gdmgreeter-1.0 libgdmgreeter1, libgdmgreeter-dev,
    libgdmsimplegreeter1, libgdmsimplegreeter-dev packages
* debian/patches:
  - Drop 00git_use_new_power_interface.patch,
    00git_xsession-errors_symlink.patch and 29_grep_path.patch
    which are upstream
  - refreshed as needed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches