Skip to content

Commit

Permalink
Releasing 1.25.0
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-ancell committed Nov 20, 2017
1 parent 64eab84 commit fe28fb1
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 26 deletions.
7 changes: 7 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Overview of changes in lightdm 1.25.0

* Support moc being called moc-qt5 (e.g. Fedora)
* Fail configure if MOC can't be found
* Expose autologin-session as a hint to the greeter
* Fix timed autologins not using autologin-session when no session specified

Overview of changes in lightdm 1.24.0

* No changes from 1.22
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.

AC_INIT(lightdm, 1.24.0)
AC_INIT(lightdm, 1.25.0)
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
Expand Down
21 changes: 21 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
lightdm (1.25.0-0ubuntu1) bionic; urgency=medium

* New upstream release:
- Support moc being called moc-qt5 (e.g. Fedora)
- Fail configure if MOC can't be found
- Expose autologin-session as a hint to the greeter
- Fix timed autologins not using autologin-session when no session specified
* debian/control:
- Use standards version 4.1.1
- Fix package sections
- Fix introspection dependencies
- Use recent debhelper
* debian/liblightdm-gobject-1-0.symbols:
* debian/liblightdm-qt-3-0.symbols:
* debian/liblightdm-qt5-3-0.symbols:
- Updated
* debian/watch:
- Update to use github for tarballs

-- Robert Ancell <[email protected]> Mon, 20 Nov 2017 15:38:13 +1300

lightdm (1.24.0-0ubuntu1) artful; urgency=medium

* New upstream release:
Expand Down
14 changes: 9 additions & 5 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ Section: x11
Priority: optional
Maintainer: Robert Ancell <[email protected]>
Uploaders: Julien Lavergne <[email protected]>
Standards-Version: 3.9.8
Standards-Version: 4.1.1
Build-Depends: dbus,
debhelper (>= 9),
debhelper (>= 9.20160709),
dh-autoreconf,
dh-translations,
dh-systemd (>= 1.14),
gnome-common,
gtk-doc-tools,
intltool (>= 0.35.0),
Expand Down Expand Up @@ -57,6 +56,7 @@ Description: Display Manager
* Cross-desktop (greeters can be written in any toolkit)

Package: liblightdm-gobject-1-0
Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Expand All @@ -68,27 +68,30 @@ Description: LightDM GObject client library
A GObject based library for LightDM clients to use to interface with LightDM.

Package: gir1.2-lightdm-1
Section: libs
Section: introspection
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${gir:Depends},
liblightdm-gobject-1-0 (= ${binary:Version}),
Description: Typelib file for liblightdm-1
A GObject based library for LightDM clients to use to interface with LightDM.

Package: liblightdm-qt-3-0
Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
Recommends: lightdm
Recommends: lightdm
Conflicts: liblightdm-qt-1-0 (>= 1.1.1)
Replaces: liblightdm-qt-1-0 (>= 1.1.1)
Description: LightDM Qt client library
A Qt based library for LightDM clients to use to interface with LightDM.

Package: liblightdm-qt5-3-0
Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Expand All @@ -104,6 +107,7 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
liblightdm-gobject-1-0 (= ${binary:Version}),
gir1.2-lightdm-1 (= ${binary:Version}),
libdbus-glib-1-dev,
libglib2.0-dev,
libxklavier-dev,
Expand Down
1 change: 1 addition & 0 deletions debian/liblightdm-gobject-1-0.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ liblightdm-gobject-1.so.0 liblightdm-gobject-1-0 #MINVER#
lightdm_greeter_error_quark@Base 1.19.2
lightdm_greeter_get_authentication_user@Base 0.9.2
lightdm_greeter_get_autologin_guest_hint@Base 0.9.2
lightdm_greeter_get_autologin_session_hint@Base 1.25.0
lightdm_greeter_get_autologin_timeout_hint@Base 0.9.2
lightdm_greeter_get_autologin_user_hint@Base 0.9.2
lightdm_greeter_get_default_session_hint@Base 0.9.2
Expand Down
1 change: 1 addition & 0 deletions debian/liblightdm-qt-3-0.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ liblightdm-qt-3.so.0 liblightdm-qt-3-0 #MINVER#
(c++)"QLightDM::Greeter::isAuthenticated() const@Base" 1.21.3
(c++)"QLightDM::Greeter::selectGuestHint() const@Base" 1.21.3
(c++)"QLightDM::Greeter::inAuthentication() const@Base" 1.21.3
(c++)"QLightDM::Greeter::autologinSessionHint() const@Base" 1.25.0
(c++)"QLightDM::Greeter::autologinUserHint() const@Base" 1.21.3
(c++)"QLightDM::Greeter::authenticationUser() const@Base" 1.21.3
(c++)"QLightDM::Greeter::autologinGuestHint() const@Base" 1.21.3
Expand Down
1 change: 1 addition & 0 deletions debian/liblightdm-qt5-3-0.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ liblightdm-qt5-3.so.0 liblightdm-qt5-3-0 #MINVER#
(c++)"QLightDM::Greeter::isAuthenticated() const@Base" 1.21.3
(c++)"QLightDM::Greeter::selectGuestHint() const@Base" 1.21.3
(c++)"QLightDM::Greeter::inAuthentication() const@Base" 1.21.3
(c++)"QLightDM::Greeter::autologinSessionHint() const@Base" 1.25.0
(c++)"QLightDM::Greeter::autologinUserHint() const@Base" 1.21.3
(c++)"QLightDM::Greeter::authenticationUser() const@Base" 1.21.3
(c++)"QLightDM::Greeter::autologinGuestHint() const@Base" 1.21.3
Expand Down
26 changes: 13 additions & 13 deletions debian/patches/04_language_handling.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ Description: Adjustments due to handling of languages
Forwarded: not-needed
Author: Gunnar Hjalmarsson <[email protected]>

Index: trunk/liblightdm-gobject/language.c
Index: lightdm/liblightdm-gobject/language.c
===================================================================
--- trunk.orig/liblightdm-gobject/language.c
+++ trunk/liblightdm-gobject/language.c
--- lightdm.orig/liblightdm-gobject/language.c
+++ lightdm/liblightdm-gobject/language.c
@@ -60,7 +60,7 @@ static GList *languages = NULL;
static void
update_languages (void)
{
- gchar *command = "locale -a";
+ gchar *command = "/usr/share/language-tools/language-options";
gchar *stdout_text = NULL, *stderr_text = NULL;
g_autofree gchar *stdout_text = NULL;
g_autofree gchar *stderr_text = NULL;
gint exit_status;
gboolean result;
@@ -181,15 +181,39 @@ lightdm_get_language (void)
@@ -168,15 +168,39 @@ lightdm_get_language (void)
{
const gchar *lang;
GList *link;
Expand Down Expand Up @@ -56,10 +56,10 @@ Index: trunk/liblightdm-gobject/language.c
return language;
}

Index: trunk/tests/scripts/language-env.conf
Index: lightdm/tests/scripts/language-env.conf
===================================================================
--- trunk.orig/tests/scripts/language-env.conf
+++ trunk/tests/scripts/language-env.conf
--- lightdm.orig/tests/scripts/language-env.conf
+++ lightdm/tests/scripts/language-env.conf
@@ -24,8 +24,8 @@ user-session=default
#?SESSION-X-0 CONNECT-XSERVER

Expand All @@ -71,11 +71,11 @@ Index: trunk/tests/scripts/language-env.conf
#?*SESSION-X-0 READ-ENV NAME=GDM_LANG
#?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU

Index: trunk/src/seat.c
Index: lightdm/src/seat.c
===================================================================
--- trunk.orig/src/seat.c
+++ trunk/src/seat.c
@@ -1016,7 +1016,7 @@ configure_session (Session *session, Ses
--- lightdm.orig/src/seat.c
+++ lightdm/src/seat.c
@@ -1008,7 +1008,7 @@ configure_session (Session *session, Ses
}
if (language && language[0] != '\0')
{
Expand Down
8 changes: 4 additions & 4 deletions debian/patches/autologin-session-workaround.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Description: Workaround faulty setting from Ubuntu user-setup package
Author: Robert Ancell <[email protected]>
Bug: https://bugs.launchpad.net/bugs/1484083

Index: trunk/src/seat.c
Index: lightdm/src/seat.c
===================================================================
--- trunk.orig/src/seat.c
+++ trunk/src/seat.c
@@ -1046,7 +1046,12 @@ create_user_session (Seat *seat, const g
--- lightdm.orig/src/seat.c
+++ lightdm/src/seat.c
@@ -1039,7 +1039,12 @@ create_user_session (Seat *seat, const g
if (autostart)
{
const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session");
Expand Down
2 changes: 1 addition & 1 deletion debian/source/format
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0
3.0 (quilt)
3 changes: 1 addition & 2 deletions debian/watch
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
version=3
https://launchpad.net/lightdm/+download .*/lightdm-([0-9.]+)\.tar\.xz

https://github.com/CanonicalLtd/lightdm/releases .*/lightdm-([0-9.]+)\.tar\.xz

0 comments on commit fe28fb1

Please sign in to comment.