diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch | 21 | ||||
| -rw-r--r-- | debian/patches/04_language_handling.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
6 files changed, 20 insertions, 24 deletions
@@ -1,3 +1,8 @@ +Overview of changes in lightdm 1.12.0 + + * Fix assumption that the display server is X when running scripts. + * Don't access .dmrc files until information from these files is required. + Overview of changes in lightdm 1.11.9 * Don't check the logind CanGraphical seat property unless diff --git a/configure.ac b/configure.ac index 1fbc0749..01a32509 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.11.9) +AC_INIT(lightdm, 1.12.0) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) diff --git a/debian/changelog b/debian/changelog index 799c792b..a67dfb80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +lightdm (1.12.0-0ubuntu1) utopic; urgency=medium + + * New upstream release: + - Fix assumption that the display server is X when running scripts. + (LP: #1305006) + - Don't access .dmrc files until information from these files is required. + (LP: #1370852) + * debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch: + - Dropped, Unity 2D doesn't exist and all users will have been migrated in + 14.04 LTS + + -- Robert Ancell <robert.ancell@canonical.com> Tue, 30 Sep 2014 15:11:51 +1300 + lightdm (1.11.9-0ubuntu1) utopic; urgency=medium * New upstream release: diff --git a/debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch b/debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch deleted file mode 100644 index bc345e63..00000000 --- a/debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch +++ /dev/null @@ -1,21 +0,0 @@ -# Description: Remove unity-2d (not anymore supported) and transition to unity -# starting from quantal. llvmpipe is used in case no hardware -# acceleration is available. -=== modified file 'common/user-list.c' -Index: trunk/common/user-list.c -=================================================================== ---- trunk.orig/common/user-list.c 2014-02-08 17:09:03.157580601 -0500 -+++ trunk/common/user-list.c 2014-02-08 17:34:52.897555476 -0500 -@@ -1219,6 +1219,12 @@ - - if (!priv->path) - load_dmrc (user); -+ -+ if (g_strcmp0 (priv->session, "ubuntu-2d") == 0) -+ { -+ g_free(priv->session); -+ priv->session = g_strdup ("ubuntu"); -+ } - } - - /** diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch index 6f06e49c..7547f919 100644 --- a/debian/patches/04_language_handling.patch +++ b/debian/patches/04_language_handling.patch @@ -75,7 +75,7 @@ Index: trunk/src/seat.c =================================================================== --- trunk.orig/src/seat.c +++ trunk/src/seat.c -@@ -950,7 +950,7 @@ configure_session (Session *session, Ses +@@ -944,7 +944,7 @@ configure_session (Session *session, Ses session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name); if (language && language[0] != '\0') { diff --git a/debian/patches/series b/debian/patches/series index 3d694451..53010f35 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -01_transition_ubuntu2d_ubuntu_desktop.patch 04_language_handling.patch 05_translate_debian_files.patch 06_apparmor-unix.patch |