Ubuntu
gdm package

Merge lp:~darkxst/ubuntu/saucy/gdm/lp982889 into lp:ubuntu/saucy/gdm

  1. Saucy (13.10)
  2. lp982889
  3. Merge into saucy
Proposed by Tim Lunn
Status: Merged
Merged at revision: 275
Proposed branch: lp:~darkxst/ubuntu/saucy/gdm/lp982889
Merge into: lp:ubuntu/saucy/gdm
Diff against target: 64 lines (+14/-4)
4 files modified
debian/changelog (+9/-0)
debian/control (+2/-1)
debian/control.in (+1/-0)
debian/gdm.upstart (+2/-3)
To merge this branch: bzr merge lp:~darkxst/ubuntu/saucy/gdm/lp982889
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+165300@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-04-29 10:48:29 +0000
3+++ debian/changelog 2013-05-23 08:15:32 +0000
4@@ -1,3 +1,12 @@
5+gdm (3.6.1-0ubuntu6) saucy; urgency=low
6+
7+ * Merge changes from lightdm to fix plymouth race (LP: #982889)
8+ - lightdm.upstart: Add a start condition on plymouth-ready, and
9+ drop conditions already handled by plymouth-splash.
10+ - control: Depend on the new plymouth version that provides plymouth-ready.
11+
12+ -- Tim Lunn <tim@feathertop.org> Thu, 23 May 2013 17:45:44 +1000
13+
14 gdm (3.6.1-0ubuntu5) saucy; urgency=low
15
16 * Add debian/patches/00git_logind_check.patch: Fix checks for logind.
17
18=== modified file 'debian/control'
19--- debian/control 2013-04-29 10:48:29 +0000
20+++ debian/control 2013-05-23 08:15:32 +0000
21@@ -7,7 +7,7 @@
22 Priority: optional
23 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
25-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
26+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
27 Build-Depends: gnome-pkg-tools (>= 0.16.3),
28 debhelper (>= 8.1.0),
29 cdbs,
30@@ -64,6 +64,7 @@
31 gnome-session-bin (>= 3.6),
32 gnome-settings-daemon (>= 3.2),
33 metacity (>= 1:2.34.2),
34+ plymouth (>= 0.8.8-0ubuntu6.1),
35 policykit-1-gnome,
36 upower,
37 libpam-systemd,
38
39=== modified file 'debian/control.in'
40--- debian/control.in 2013-04-29 10:48:29 +0000
41+++ debian/control.in 2013-05-23 08:15:32 +0000
42@@ -60,6 +60,7 @@
43 gnome-session-bin (>= 3.6),
44 gnome-settings-daemon (>= 3.2),
45 metacity (>= 1:2.34.2),
46+ plymouth (>= 0.8.8-0ubuntu6.1),
47 policykit-1-gnome,
48 upower,
49 libpam-systemd,
50
51=== modified file 'debian/gdm.upstart'
52--- debian/gdm.upstart 2012-08-28 12:26:39 +0000
53+++ debian/gdm.upstart 2013-05-23 08:15:32 +0000
54@@ -9,9 +9,8 @@
55 start on ((filesystem
56 and runlevel [!06]
57 and started dbus
58- and (drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
59- or stopped udev-fallback-graphics))
60- or runlevel PREVLEVEL=S)
61+ and plymouth-ready)
62+ or runlevel PREVLEVEL=S)
63
64 stop on runlevel [016]
65

Subscribers

People subscribed via source and target branches

to all changes: