Releasing 1.25.01.25.0

11 files changed, 60 insertions, 26 deletions

diff --git a/NEWS b/NEWS
index 8cb6f75b..74182b26 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/configure.ac b/configure.ac
index ba5f0042..613e168d 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.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])
diff --git a/debian/changelog b/debian/changelog
index 5a1d8aa7..a92bcd0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <robert.ancell@canonical.com>  Mon, 20 Nov 2017 15:38:13 +1300
+
 lightdm (1.24.0-0ubuntu1) artful; urgency=medium
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 32be820d..21fcda1a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,11 @@ Section: x11
 Priority: optional
 Maintainer: Robert Ancell <robert.ancell@ubuntu.com>
 Uploaders: Julien Lavergne <gilir@ubuntu.com>
-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),
@@ -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}
@@ -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}
@@ -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,
diff --git a/debian/liblightdm-gobject-1-0.symbols b/debian/liblightdm-gobject-1-0.symbols
index bdb86e03..ff8cc580 100644
--- a/debian/liblightdm-gobject-1-0.symbols
+++ b/debian/liblightdm-gobject-1-0.symbols
@@ -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
diff --git a/debian/liblightdm-qt-3-0.symbols b/debian/liblightdm-qt-3-0.symbols
index 9b4aaa4e..8d5accdf 100644
--- a/debian/liblightdm-qt-3-0.symbols
+++ b/debian/liblightdm-qt-3-0.symbols
@@ -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
diff --git a/debian/liblightdm-qt5-3-0.symbols b/debian/liblightdm-qt5-3-0.symbols
index 8062d763..c97f897e 100644
--- a/debian/liblightdm-qt5-3-0.symbols
+++ b/debian/liblightdm-qt5-3-0.symbols
@@ -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
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 809fe890..17e0dae2 100644
--- a/debian/patches/04_language_handling.patch
+++ b/debian/patches/04_language_handling.patch
@@ -2,20 +2,20 @@ Description: Adjustments due to handling of languages
 Forwarded: not-needed
 Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
 
-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;
@@ -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
  
@@ -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')
      {
diff --git a/debian/patches/autologin-session-workaround.patch b/debian/patches/autologin-session-workaround.patch
index c4c0bc6d..25878e46 100644
--- a/debian/patches/autologin-session-workaround.patch
+++ b/debian/patches/autologin-session-workaround.patch
@@ -2,11 +2,11 @@ Description: Workaround faulty setting from Ubuntu user-setup package
 Author: Robert Ancell <robert.ancell@canonical.com>
 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");
diff --git a/debian/source/format b/debian/source/format
index d3827e75..163aaf8d 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index 5077dae2..ede7cd1a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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