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
=== added file 'debian/50-greeter-wrapper.conf'
--- debian/50-greeter-wrapper.conf 1970-01-01 00:00:00 +0000
+++ debian/50-greeter-wrapper.conf 2013-07-01 04:55:31 +0000
@@ -0,0 +1,2 @@
1[SeatDefaults]
2greeter-wrapper=/usr/lib/lightdm/lightdm-greeter-session
03
=== added file 'debian/50-xserver-command.conf'
--- debian/50-xserver-command.conf 1970-01-01 00:00:00 +0000
+++ debian/50-xserver-command.conf 2013-07-01 04:55:31 +0000
@@ -0,0 +1,3 @@
1[SeatDefaults]
2# Dump core
3xserver-command=X -core
04
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-27 07:15:59 +0000
+++ debian/changelog 2013-07-01 04:55:31 +0000
@@ -1,10 +1,34 @@
1lightdm (1.7.4-0ubuntu1) UNRELEASED; urgency=low1lightdm (1.7.5-0ubuntu1) UNRELEASED; urgency=low
22
3 * Clean packaging and prepare it for daily release3 * Clean packaging and prepare it for daily release
4 * Automatic snapshot from revision 1629 (bootstrap)4 * Automatic snapshot from revision 1629 (bootstrap)
55
6 -- Didier Roche <didrocks@ubuntu.com> Thu, 27 Jun 2013 08:51:29 +02006 -- Didier Roche <didrocks@ubuntu.com> Thu, 27 Jun 2013 08:51:29 +0200
77
8lightdm (1.7.4-0ubuntu1) saucy; urgency=low
9
10 * New upstream release:
11 - Set XDG_SEAT and XDG_VTNR environment variables.
12 - Add initial support for Unity (i.e. Mir based) seats.
13 - Add a greeter wrapper option.
14 * debian/50-xserver-command.conf:
15 * debian/patches/05_add_xserver_core_option.patch:
16 - Use a conf file to replace X server core patch
17 * debian/50-greeter-wrapper.conf
18 * debian/patches/03_launch_dbus.patch
19 - Use a conf file to greeter wrapper patch
20
21 -- Robert Ancell <robert.ancell@canonical.com> Mon, 01 Jul 2013 15:47:21 +1200
22
23lightdm (1.7.3-0ubuntu2) saucy; urgency=low
24
25 * debian/guest-account: disable screen locking in a more reliable way.
26 Rather than trying to write a key for another user, while setting up the
27 guest user account, just set up an autostart desktop that will set it
28 during the login (lp: #951000)
29
30 -- Sebastien Bacher <seb128@ubuntu.com> Tue, 25 Jun 2013 22:30:04 +0200
31
8lightdm (1.7.3-0ubuntu1) saucy; urgency=low32lightdm (1.7.3-0ubuntu1) saucy; urgency=low
933
10 * New upstream release:34 * New upstream release:
1135
=== modified file 'debian/guest-account'
--- debian/guest-account 2013-04-30 19:12:50 +0000
+++ debian/guest-account 2013-07-01 04:55:31 +0000
@@ -59,13 +59,6 @@
59 # setup session59 # setup session
60 #60 #
6161
62 # disable screensaver, to avoid locking guest out of itself (no password)
63 if [ -e /usr/bin/gconftool-2 ]; then
64 su $USER <<EOF
65 gconftool-2 --set --type bool /desktop/gnome/lockdown/disable_lock_screen True
66EOF
67 fi
68
69 # disable some services that are unnecessary for the guest session62 # disable some services that are unnecessary for the guest session
70 mkdir --parents "$HOME"/.config/autostart63 mkdir --parents "$HOME"/.config/autostart
71 cd /etc/xdg/autostart/64 cd /etc/xdg/autostart/
@@ -78,6 +71,11 @@
78 fi71 fi
79 done72 done
8073
74 echo "[Desktop Entry]" >> "$HOME"/.config/autostart/screenlocking.desktop
75 echo "Name='Disable screen locking in guest session'" >> "$HOME"/.config/autostart/screenlocking.desktop
76 echo "Type=Application" >> "$HOME"/.config/autostart/screenlocking.desktop
77 echo "Exec=gsettings set org.gnome.desktop.lockdown disable-lock-screen true" >> "$HOME"/.config/autostart/screenlocking.desktop
78
81 mkdir -p "$HOME"/.kde/share/config79 mkdir -p "$HOME"/.kde/share/config
82 echo "[Basic Settings]" >> "$HOME"/.kde/share/config/nepomukserverrc80 echo "[Basic Settings]" >> "$HOME"/.kde/share/config/nepomukserverrc
83 echo "Start Nepomuk=false" >> "$HOME"/.kde/share/config/nepomukserverrc81 echo "Start Nepomuk=false" >> "$HOME"/.kde/share/config/nepomukserverrc
8482
=== modified file 'debian/lightdm.install'
--- debian/lightdm.install 2013-04-30 19:12:50 +0000
+++ debian/lightdm.install 2013-07-01 04:55:31 +0000
@@ -12,3 +12,5 @@
12debian/guest-account usr/sbin12debian/guest-account usr/sbin
13debian/lightdm-greeter-session usr/lib/lightdm13debian/lightdm-greeter-session usr/lib/lightdm
14debian/source_lightdm.py usr/share/apport/package-hooks14debian/source_lightdm.py usr/share/apport/package-hooks
15debian/50-xserver-command.conf etc/lightdm/lightdm.conf.d
16debian/50-greeter-wrapper.conf etc/lightdm/lightdm.conf.d
1517
=== modified file 'debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch'
--- debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch 2013-06-19 01:24:22 +0000
+++ debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch 2013-07-01 04:55:31 +0000
@@ -2,11 +2,11 @@
2# starting from quantal. llvmpipe is used in case no hardware2# starting from quantal. llvmpipe is used in case no hardware
3# acceleration is available.3# acceleration is available.
4=== modified file 'liblightdm-gobject/user.c'4=== modified file 'liblightdm-gobject/user.c'
5Index: lightdm-1.5.1/liblightdm-gobject/user.c5Index: lightdm-1.7.4/liblightdm-gobject/user.c
6===================================================================6===================================================================
7--- lightdm-1.5.1.orig/liblightdm-gobject/user.c 2013-03-08 11:18:21.877614772 +13007--- lightdm-1.7.4.orig/liblightdm-gobject/user.c 2013-07-01 15:49:24.038864562 +1200
8+++ lightdm-1.5.1/liblightdm-gobject/user.c 2013-03-08 11:18:21.873614772 +13008+++ lightdm-1.7.4/liblightdm-gobject/user.c 2013-07-01 15:49:24.034864562 +1200
9@@ -1313,6 +1313,12 @@9@@ -1307,6 +1307,12 @@
10 load_dmrc (user);10 load_dmrc (user);
11 load_accounts_service (user); // overrides dmrc values11 load_accounts_service (user); // overrides dmrc values
12 12
1313
=== removed file 'debian/patches/03_launch_dbus.patch'
--- debian/patches/03_launch_dbus.patch 2013-06-19 01:24:22 +0000
+++ debian/patches/03_launch_dbus.patch 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
1=== modified file 'src/display.c'
2Index: b/src/display.c
3===================================================================
4--- a/src/display.c
5+++ b/src/display.c
6@@ -637,6 +637,8 @@
7 }
8 }
9
10+static void prepend_argv (gchar ***argv, const gchar *value);
11+
12 static gboolean
13 display_start_greeter (Display *display)
14 {
15@@ -664,6 +666,8 @@
16 if (!argv)
17 return TRUE;
18
19+ prepend_argv (&argv, "/usr/lib/lightdm/lightdm-greeter-session");
20+
21 session_run (display->priv->session, argv);
22
23 return FALSE;
240
=== modified file 'debian/patches/04_language_handling.patch'
--- debian/patches/04_language_handling.patch 2013-06-19 01:24:22 +0000
+++ debian/patches/04_language_handling.patch 2013-07-01 04:55:31 +0000
@@ -2,10 +2,10 @@
2Forwarded: not-needed2Forwarded: not-needed
3Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>3Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
44
5Index: b/liblightdm-gobject/language.c5Index: lightdm-1.7.4/liblightdm-gobject/language.c
6===================================================================6===================================================================
7--- a/liblightdm-gobject/language.c7--- lightdm-1.7.4.orig/liblightdm-gobject/language.c 2013-07-01 15:49:32.086864815 +1200
8+++ b/liblightdm-gobject/language.c8+++ lightdm-1.7.4/liblightdm-gobject/language.c 2013-07-01 15:49:32.082864815 +1200
9@@ -40,7 +40,7 @@9@@ -40,7 +40,7 @@
10 static void10 static void
11 update_languages (void)11 update_languages (void)
@@ -15,11 +15,11 @@
15 gchar *stdout_text = NULL, *stderr_text = NULL;15 gchar *stdout_text = NULL, *stderr_text = NULL;
16 gint exit_status;16 gint exit_status;
17 gboolean result;17 gboolean result;
18Index: b/src/display.c18Index: lightdm-1.7.4/src/display.c
19===================================================================19===================================================================
20--- a/src/display.c20--- lightdm-1.7.4.orig/src/display.c 2013-07-01 15:49:32.086864815 +1200
21+++ b/src/display.c21+++ lightdm-1.7.4/src/display.c 2013-07-01 15:49:32.082864815 +1200
22@@ -734,7 +734,7 @@22@@ -754,7 +754,7 @@
23 language = user_get_language (user);23 language = user_get_language (user);
24 if (language != NULL && language != '\0')24 if (language != NULL && language != '\0')
25 {25 {
2626
=== removed file 'debian/patches/05_add_xserver_core_option.patch'
--- debian/patches/05_add_xserver_core_option.patch 2013-06-19 01:24:22 +0000
+++ debian/patches/05_add_xserver_core_option.patch 1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
1Index: lightdm-1.5.1/src/xserver-local.c
2===================================================================
3--- lightdm-1.5.1.orig/src/xserver-local.c 2013-03-08 11:18:26.989614595 +1300
4+++ lightdm-1.5.1/src/xserver-local.c 2013-03-08 11:18:26.989614595 +1300
5@@ -441,6 +441,9 @@
6 if (server->priv->layout)
7 g_string_append_printf (command, " -layout %s", server->priv->layout);
8
9+ /* We always want apport to be able to catch crashes */
10+ g_string_append (command, " -core");
11+
12 gethostname (hostname, 1024);
13 number = g_strdup_printf ("%d", xserver_get_display_number (XSERVER (server)));
14 if (!server->priv->xdmcp_key)
15Index: lightdm-1.5.1/tests/src/X.c
16===================================================================
17--- lightdm-1.5.1.orig/tests/src/X.c 2013-03-08 11:18:26.989614595 +1300
18+++ lightdm-1.5.1/tests/src/X.c 2013-03-08 11:18:26.989614595 +1300
19@@ -297,6 +297,9 @@
20 else if (strcmp (arg, "-nr") == 0)
21 {
22 }
23+ else if (strcmp (arg, "-core") == 0)
24+ {
25+ }
26 else if (strcmp (arg, "-background") == 0)
27 {
28 /* Ignore arg */
29@@ -333,6 +336,7 @@
30 "-nolisten protocol Don't listen on protocol\n"
31 "-background [none] Create root window with no background\n"
32 "-nr (Ubuntu-specific) Synonym for -background none\n"
33+ "-core Dump core upon crash\n"
34 "-query host-name Contact named host for XDMCP\n"
35 "-broadcast Broadcast for XDMCP\n"
36 "-port port-num UDP port number to send messages to\n"
370
=== modified file 'debian/patches/series'
--- debian/patches/series 2013-06-19 01:24:22 +0000
+++ debian/patches/series 2013-07-01 04:55:31 +0000
@@ -1,4 +1,2 @@
101_transition_ubuntu2d_ubuntu_desktop.patch101_transition_ubuntu2d_ubuntu_desktop.patch
2#03_launch_dbus.patch
304_language_handling.patch204_language_handling.patch
405_add_xserver_core_option.patch

Subscribers

People subscribed via source and target branches