gdm

Merge lp://staging/~cody-somerville/gdm/depend-on-minimal-gnome-session into lp://staging/~ubuntu-desktop/gdm/ubuntu

  1. depend-on-minimal-gnome-session
  2. Merge into ubuntu
Proposed by Cody A.W. Somerville
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~cody-somerville/gdm/depend-on-minimal-gnome-session
Merge into: lp://staging/~ubuntu-desktop/gdm/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~cody-somerville/gdm/depend-on-minimal-gnome-session
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+8829@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody A.W. Somerville (cody-somerville) wrote :

Depend on gnome-session-bin (minimal runtime of gnome-session needed by gdm) instead of gnome-session. This should make gdm stop pulling in almost all of gnome.

lp://staging/~cody-somerville/gdm/depend-on-minimal-gnome-session updated
30. By Martin Pitt

* Update to latest upstream git head:
  - Make greeter login window be a dock. Fixes metacity complaining about
    session management. (LP: #395324)
* Drop patches which are fixed upstream:
  - 00git-greeter-session-management.patch
  - 00git-invalid-dmrc-layout.patch
  - 00git-use-after-free.patch
  - 00git-xklavier4.patch
  - 02_dont_force_us_keyboard.patch
  - 04_polkit1.patch

31. By Martin Pitt

80_workaround_incorrect_directories.patch: Update to new upstream version.

32. By Martin Pitt

Drop 01_xconfigoptions.patch; these configure variables are not used any
more in the upstream code, and upstream supplies the X.org -br option by
default now. Also drop the corresponding configure changes from
17_update_default_xserver.patch.

33. By Martin Pitt

Apply 15_usplash.patch to debian/gdm.init and drop the patch.

34. By Martin Pitt

* 17_update_default_xserver.patch: Update to new upstream version, add
  corresponding configure change, and add patch tag header.
* Drop 99_autoreconf.patch. The only remaining build system change is the
  previous item.

35. By Martin Pitt

Drop 20_xdm-stuff.patch, it's just cruft.

36. By Martin Pitt

drop + from version number, gconf does not like it

37. By Martin Pitt

Drop debian/Xsession, and change debian/rules to install the upstream one.

38. By Martin Pitt

rename 17_update_default_xserver.patch to 02_x_server_location.patch, add upstream link

39. By Martin Pitt

01_xrdb_nocpp.patch: Add patch tag header, forward upstream.

40. By Martin Pitt

Rename 80_workaround_incorrect_directories.patch to
04_fix_external_program_directories.patch and add patch tag header.

41. By Martin Pitt

Rename 81_initial_server_on_vt7.patch to 05_initial_server_on_vt7.patch.

42. By Martin Pitt

debian/rules: Remove /var/gdm (empty and nonstandard) and /var/run (will
be created at runtime), thanks lintian.

43. By Martin Pitt

debian/copyright: Point to versioned GPL, thanks lintian.

44. By Martin Pitt

debian/gdm.postrm: Use "set -e" to conform to policy.

45. By Martin Pitt

Add debian/xterm.desktop: Reintroduce "failsafe xterm" session.

46. By Martin Pitt

releasing version 2.26.1git20090717-0ubuntu1

47. By Martin Pitt

Add 06_run_xsession.d.patch: Run /etc/X11/Xsession.d/. (LP: #401201)

48. By Martin Pitt

* New upstream release:
  - Favor XFree86 Xinerama over Solaris Xinerama on Solaris
  - Make greeter a well behaved session client
  - XDMCP fixes
  - Fix up btmp record handling
  - Handle locales with modifiers better
  - Use better logic with keyboard layout handling
  - Change example PAM file/documentation to demonstrate password-less login
  - Handle usernames from non-utf8 locales
  - Allow dbus introspection for gdm services
  - Show more details authentication error messages in UI
  - Allow uppercase and lowercase booleans in config file
  - Be more consistent with booleans in schemas
  - Use g_timeout_add_seconds to reduce wakeups
  - Make greeter window more clear when user list is disabled
  - Put greeter login window in same ctrl-alt-tab menu as panel
  - Port greeter to PolicyKit 1.0
  - Shave off 1/2 second delay when bringing up greeter
  - OS X portability fixes
  - Look for locales in /usr/lib/locale instead of /usr/share/locale
  - Better handling when two users have the same name
* Drop 01_xrdb_nocpp.patch, applied upstream.

49. By Martin Pitt

Add debian/watch.

50. By Martin Pitt

update 04_fix_external_program_directories.patch to new upstream version

51. By Martin Pitt

fix typo in 06_run_xsession.d.patch

52. By Martin Pitt

Add 01_default_keyboard_layout_hal.patch: Get default keyboard layout from
hal. Patch taken from Fedora. (LP: #395103) Add libhal-dev build
dependency.

53. By Martin Pitt

Add 99_autoreconf.patch to pick up above change.

54. By Martin Pitt

back out version upgrade to 2.27.4, currently crashes

55. By Martin Pitt

06_run_xsession.d.patch: do what I mean

56. By Martin Pitt

releasing version 2.26.1git20090717-0ubuntu2

57. By seb128 <seb128@seb128-laptop>

releasing version 2.27.4-0ubuntu1

58. By Didier Roche-Tolomelli

debian/control: Fix typo in Conflicts

59. By seb128 <seb128@seb128-laptop>

releasing version 2.27.4-0ubuntu2

60. By Martin Pitt

06_run_xsession.d.patch: Define $OPTIONFILE, so that the
75dbus_dbus-launch Xsession.d script properly runs the session under
dbus-launch. (LP: #402161)

61. By Martin Pitt

releasing version 2.27.4-0ubuntu3

62. By Cody A.W. Somerville

gdm (2.27.4-0ubuntu4) karmic; urgency=low

* debian/control:
  - Replace dependency on gnome-session with gnome-session-bin
  - Add recommends on metacity | x-window-manager
  - Add recommends on gnome-settings-daemon | xfconf
  - Add suggestion on gnome-power-manager, gnome-orca, gok, and gnome-mag

 -- Cody A.W. somerville <email address hidden>Tue, 21 Jul 2009 12:29:06 -0400

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-07-13 12:50:39 +0000
+++ debian/changelog 2009-07-15 16:23:20 +0000
@@ -1,3 +1,9 @@
1gdm (2.26.1-0ubuntu8) karmic; urgency=low
2
3 * debian/control: Change dependency on gnome-session to gnome-session-bin.
4
5 -- Cody A.W. Somerville <cody.somerville@canonical.com> Wed, 15 Jul 2009 12:20:54 -0400
6
1gdm (2.26.1-0ubuntu7) karmic; urgency=low7gdm (2.26.1-0ubuntu7) karmic; urgency=low
28
3 * Rename 04_xklavier4.patch to 00git-xklavier4.patch.9 * Rename 04_xklavier4.patch to 00git-xklavier4.patch.
410
=== modified file 'debian/control'
--- debian/control 2009-07-13 10:07:59 +0000
+++ debian/control 2009-07-15 16:23:20 +0000
@@ -36,7 +36,7 @@
36 adduser,36 adduser,
37 libpam-modules (>= 0.72-1),37 libpam-modules (>= 0.72-1),
38 libpam-runtime (>= 0.76-13.1),38 libpam-runtime (>= 0.76-13.1),
39 gnome-session,39 gnome-session-bin,
40 kbd | console-tools40 kbd | console-tools
41Recommends: xserver-xorg41Recommends: xserver-xorg
42Suggests: locales,42Suggests: locales,

Subscribers

People subscribed via source and target branches