Light Display Manager

Merge lp:~robert-ancell/lightdm/unity-packaging-saucy-merge into lp:~mir-team/lightdm/unity

  1. unity-packaging-saucy-merge
  2. Merge into unity
Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1634
Merged at revision: 1634
Proposed branch: lp:~robert-ancell/lightdm/unity-packaging-saucy-merge
Merge into: lp:~mir-team/lightdm/unity
Diff against target: 226 lines (+48/-80)
10 files modified
debian/50-greeter-wrapper.conf (+2/-0)
debian/50-xserver-command.conf (+3/-0)
debian/changelog (+25/-1)
debian/guest-account (+5/-7)
debian/lightdm.install (+2/-0)
debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch (+4/-4)
debian/patches/03_launch_dbus.patch (+0/-23)
debian/patches/04_language_handling.patch (+7/-7)
debian/patches/05_add_xserver_core_option.patch (+0/-36)
debian/patches/series (+0/-2)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/unity-packaging-saucy-merge
Reviewer Review Type Date Requested Status
Robert Ancell Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+172269@code.launchpad.net

Commit message

Merge packaging with standard saucy version

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1633
http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-ci/32/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-saucy-amd64-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-lightdm-unity-ci/32/rebuild

review: Needs Fixing (continuous-integration)
lp:~robert-ancell/lightdm/unity-packaging-saucy-merge updated
1634. By Robert Ancell

Add missing files

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1634
http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-lightdm-unity-saucy-amd64-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-lightdm-unity-ci/33/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/50-greeter-wrapper.conf'
2--- debian/50-greeter-wrapper.conf 1970-01-01 00:00:00 +0000
3+++ debian/50-greeter-wrapper.conf 2013-07-01 04:55:31 +0000
4@@ -0,0 +1,2 @@
5+[SeatDefaults]
6+greeter-wrapper=/usr/lib/lightdm/lightdm-greeter-session
7
8=== added file 'debian/50-xserver-command.conf'
9--- debian/50-xserver-command.conf 1970-01-01 00:00:00 +0000
10+++ debian/50-xserver-command.conf 2013-07-01 04:55:31 +0000
11@@ -0,0 +1,3 @@
12+[SeatDefaults]
13+# Dump core
14+xserver-command=X -core
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2013-06-27 07:15:59 +0000
18+++ debian/changelog 2013-07-01 04:55:31 +0000
19@@ -1,10 +1,34 @@
20-lightdm (1.7.4-0ubuntu1) UNRELEASED; urgency=low
21+lightdm (1.7.5-0ubuntu1) UNRELEASED; urgency=low
22
23 * Clean packaging and prepare it for daily release
24 * Automatic snapshot from revision 1629 (bootstrap)
25
26 -- Didier Roche <didrocks@ubuntu.com> Thu, 27 Jun 2013 08:51:29 +0200
27
28+lightdm (1.7.4-0ubuntu1) saucy; urgency=low
29+
30+ * New upstream release:
31+ - Set XDG_SEAT and XDG_VTNR environment variables.
32+ - Add initial support for Unity (i.e. Mir based) seats.
33+ - Add a greeter wrapper option.
34+ * debian/50-xserver-command.conf:
35+ * debian/patches/05_add_xserver_core_option.patch:
36+ - Use a conf file to replace X server core patch
37+ * debian/50-greeter-wrapper.conf
38+ * debian/patches/03_launch_dbus.patch
39+ - Use a conf file to greeter wrapper patch
40+
41+ -- Robert Ancell <robert.ancell@canonical.com> Mon, 01 Jul 2013 15:47:21 +1200
42+
43+lightdm (1.7.3-0ubuntu2) saucy; urgency=low
44+
45+ * debian/guest-account: disable screen locking in a more reliable way.
46+ Rather than trying to write a key for another user, while setting up the
47+ guest user account, just set up an autostart desktop that will set it
48+ during the login (lp: #951000)
49+
50+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 25 Jun 2013 22:30:04 +0200
51+
52 lightdm (1.7.3-0ubuntu1) saucy; urgency=low
53
54 * New upstream release:
55
56=== modified file 'debian/guest-account'
57--- debian/guest-account 2013-04-30 19:12:50 +0000
58+++ debian/guest-account 2013-07-01 04:55:31 +0000
59@@ -59,13 +59,6 @@
60 # setup session
61 #
62
63- # disable screensaver, to avoid locking guest out of itself (no password)
64- if [ -e /usr/bin/gconftool-2 ]; then
65- su $USER <<EOF
66- gconftool-2 --set --type bool /desktop/gnome/lockdown/disable_lock_screen True
67-EOF
68- fi
69-
70 # disable some services that are unnecessary for the guest session
71 mkdir --parents "$HOME"/.config/autostart
72 cd /etc/xdg/autostart/
73@@ -78,6 +71,11 @@
74 fi
75 done
76
77+ echo "[Desktop Entry]" >> "$HOME"/.config/autostart/screenlocking.desktop
78+ echo "Name='Disable screen locking in guest session'" >> "$HOME"/.config/autostart/screenlocking.desktop
79+ echo "Type=Application" >> "$HOME"/.config/autostart/screenlocking.desktop
80+ echo "Exec=gsettings set org.gnome.desktop.lockdown disable-lock-screen true" >> "$HOME"/.config/autostart/screenlocking.desktop
81+
82 mkdir -p "$HOME"/.kde/share/config
83 echo "[Basic Settings]" >> "$HOME"/.kde/share/config/nepomukserverrc
84 echo "Start Nepomuk=false" >> "$HOME"/.kde/share/config/nepomukserverrc
85
86=== modified file 'debian/lightdm.install'
87--- debian/lightdm.install 2013-04-30 19:12:50 +0000
88+++ debian/lightdm.install 2013-07-01 04:55:31 +0000
89@@ -12,3 +12,5 @@
90 debian/guest-account usr/sbin
91 debian/lightdm-greeter-session usr/lib/lightdm
92 debian/source_lightdm.py usr/share/apport/package-hooks
93+debian/50-xserver-command.conf etc/lightdm/lightdm.conf.d
94+debian/50-greeter-wrapper.conf etc/lightdm/lightdm.conf.d
95
96=== modified file 'debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch'
97--- debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch 2013-06-19 01:24:22 +0000
98+++ debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch 2013-07-01 04:55:31 +0000
99@@ -2,11 +2,11 @@
100 # starting from quantal. llvmpipe is used in case no hardware
101 # acceleration is available.
102 === modified file 'liblightdm-gobject/user.c'
103-Index: lightdm-1.5.1/liblightdm-gobject/user.c
104+Index: lightdm-1.7.4/liblightdm-gobject/user.c
105 ===================================================================
106---- lightdm-1.5.1.orig/liblightdm-gobject/user.c 2013-03-08 11:18:21.877614772 +1300
107-+++ lightdm-1.5.1/liblightdm-gobject/user.c 2013-03-08 11:18:21.873614772 +1300
108-@@ -1313,6 +1313,12 @@
109+--- lightdm-1.7.4.orig/liblightdm-gobject/user.c 2013-07-01 15:49:24.038864562 +1200
110++++ lightdm-1.7.4/liblightdm-gobject/user.c 2013-07-01 15:49:24.034864562 +1200
111+@@ -1307,6 +1307,12 @@
112 load_dmrc (user);
113 load_accounts_service (user); // overrides dmrc values
114
115
116=== removed file 'debian/patches/03_launch_dbus.patch'
117--- debian/patches/03_launch_dbus.patch 2013-06-19 01:24:22 +0000
118+++ debian/patches/03_launch_dbus.patch 1970-01-01 00:00:00 +0000
119@@ -1,23 +0,0 @@
120-=== modified file 'src/display.c'
121-Index: b/src/display.c
122-===================================================================
123---- a/src/display.c
124-+++ b/src/display.c
125-@@ -637,6 +637,8 @@
126- }
127- }
128-
129-+static void prepend_argv (gchar ***argv, const gchar *value);
130-+
131- static gboolean
132- display_start_greeter (Display *display)
133- {
134-@@ -664,6 +666,8 @@
135- if (!argv)
136- return TRUE;
137-
138-+ prepend_argv (&argv, "/usr/lib/lightdm/lightdm-greeter-session");
139-+
140- session_run (display->priv->session, argv);
141-
142- return FALSE;
143
144=== modified file 'debian/patches/04_language_handling.patch'
145--- debian/patches/04_language_handling.patch 2013-06-19 01:24:22 +0000
146+++ debian/patches/04_language_handling.patch 2013-07-01 04:55:31 +0000
147@@ -2,10 +2,10 @@
148 Forwarded: not-needed
149 Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
150
151-Index: b/liblightdm-gobject/language.c
152+Index: lightdm-1.7.4/liblightdm-gobject/language.c
153 ===================================================================
154---- a/liblightdm-gobject/language.c
155-+++ b/liblightdm-gobject/language.c
156+--- lightdm-1.7.4.orig/liblightdm-gobject/language.c 2013-07-01 15:49:32.086864815 +1200
157++++ lightdm-1.7.4/liblightdm-gobject/language.c 2013-07-01 15:49:32.082864815 +1200
158 @@ -40,7 +40,7 @@
159 static void
160 update_languages (void)
161@@ -15,11 +15,11 @@
162 gchar *stdout_text = NULL, *stderr_text = NULL;
163 gint exit_status;
164 gboolean result;
165-Index: b/src/display.c
166+Index: lightdm-1.7.4/src/display.c
167 ===================================================================
168---- a/src/display.c
169-+++ b/src/display.c
170-@@ -734,7 +734,7 @@
171+--- lightdm-1.7.4.orig/src/display.c 2013-07-01 15:49:32.086864815 +1200
172++++ lightdm-1.7.4/src/display.c 2013-07-01 15:49:32.082864815 +1200
173+@@ -754,7 +754,7 @@
174 language = user_get_language (user);
175 if (language != NULL && language != '\0')
176 {
177
178=== removed file 'debian/patches/05_add_xserver_core_option.patch'
179--- debian/patches/05_add_xserver_core_option.patch 2013-06-19 01:24:22 +0000
180+++ debian/patches/05_add_xserver_core_option.patch 1970-01-01 00:00:00 +0000
181@@ -1,36 +0,0 @@
182-Index: lightdm-1.5.1/src/xserver-local.c
183-===================================================================
184---- lightdm-1.5.1.orig/src/xserver-local.c 2013-03-08 11:18:26.989614595 +1300
185-+++ lightdm-1.5.1/src/xserver-local.c 2013-03-08 11:18:26.989614595 +1300
186-@@ -441,6 +441,9 @@
187- if (server->priv->layout)
188- g_string_append_printf (command, " -layout %s", server->priv->layout);
189-
190-+ /* We always want apport to be able to catch crashes */
191-+ g_string_append (command, " -core");
192-+
193- gethostname (hostname, 1024);
194- number = g_strdup_printf ("%d", xserver_get_display_number (XSERVER (server)));
195- if (!server->priv->xdmcp_key)
196-Index: lightdm-1.5.1/tests/src/X.c
197-===================================================================
198---- lightdm-1.5.1.orig/tests/src/X.c 2013-03-08 11:18:26.989614595 +1300
199-+++ lightdm-1.5.1/tests/src/X.c 2013-03-08 11:18:26.989614595 +1300
200-@@ -297,6 +297,9 @@
201- else if (strcmp (arg, "-nr") == 0)
202- {
203- }
204-+ else if (strcmp (arg, "-core") == 0)
205-+ {
206-+ }
207- else if (strcmp (arg, "-background") == 0)
208- {
209- /* Ignore arg */
210-@@ -333,6 +336,7 @@
211- "-nolisten protocol Don't listen on protocol\n"
212- "-background [none] Create root window with no background\n"
213- "-nr (Ubuntu-specific) Synonym for -background none\n"
214-+ "-core Dump core upon crash\n"
215- "-query host-name Contact named host for XDMCP\n"
216- "-broadcast Broadcast for XDMCP\n"
217- "-port port-num UDP port number to send messages to\n"
218
219=== modified file 'debian/patches/series'
220--- debian/patches/series 2013-06-19 01:24:22 +0000
221+++ debian/patches/series 2013-07-01 04:55:31 +0000
222@@ -1,4 +1,2 @@
223 01_transition_ubuntu2d_ubuntu_desktop.patch
224-#03_launch_dbus.patch
225 04_language_handling.patch
226-05_add_xserver_core_option.patch

Subscribers

People subscribed via source and target branches