Update debian packaging

5 files changed, 18 insertions, 29 deletions

diff --git a/debian/changelog b/debian/changelog
index 72eebc26..3489ac90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+lightdm (1.28.0-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream release:
+    - Continue to shutdown session is removing X authority fails
+    - Set XDG_SEAT env variable in script hooks
+    - Fix small leak in XDMCP server
+    - liblightdm-qt: mark class PowerInterface as exported
+    - Fix one qt5 test being run instead of a qt4 one
+    - Remove use of deprecated g_type_class_add_private
+    - Modernize private data in objects
+    - Document XDG_SEAT_PATH in man page
+    - Fix install failing if link already exists
+    - Remove bashisms in configure.ac
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 30 Aug 2018 14:34:55 +1200
+
 lightdm (1.26.0-0ubuntu2) cosmic; urgency=medium
 
   * Cherrypick upstream PR to add support for usr-merge in apparmor
diff --git a/debian/patches/0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch b/debian/patches/0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch
deleted file mode 100644
index a06bc3b5..00000000
--- a/debian/patches/0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b44fd6e0ba228b093eb694e1243592df32a988a5 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Mon, 20 Aug 2018 23:58:23 +0100
-Subject: [PATCH] Add support for usr-merge in the apparmor profile. (LP:
- #1784023)
-
----
- data/apparmor/abstractions/lightdm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/apparmor/abstractions/lightdm b/data/apparmor/abstractions/lightdm
-index 4be3d4a3..f4b67811 100644
---- a/data/apparmor/abstractions/lightdm
-+++ b/data/apparmor/abstractions/lightdm
-@@ -23,7 +23,7 @@
- 
-   / r,
-   /bin/ rmix,
--  /bin/fusermount Px,
-+  /{,usr/}bin/fusermount Px,
-   /bin/** rmix,
-   /cdrom/ rmix,
-   /cdrom/** rmix,
--- 
-2.17.1
-
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 137e9fe3..6a46f8ec 100644
--- a/debian/patches/04_language_handling.patch
+++ b/debian/patches/04_language_handling.patch
@@ -69,7 +69,7 @@ Index: lightdm/src/seat.c
 ===================================================================
 --- lightdm.orig/src/seat.c
 +++ lightdm/src/seat.c
-@@ -944,7 +944,7 @@ configure_session (Session *session, Ses
+@@ -987,7 +987,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 476225c1..b7412c32 100644
--- a/debian/patches/autologin-session-workaround.patch
+++ b/debian/patches/autologin-session-workaround.patch
@@ -6,7 +6,7 @@ Index: lightdm/src/seat.c
 ===================================================================
 --- lightdm.orig/src/seat.c
 +++ lightdm/src/seat.c
-@@ -968,7 +968,12 @@ create_user_session (Seat *seat, const g
+@@ -1011,7 +1011,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/patches/series b/debian/patches/series
index 874d9eb6..d3ba2550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 04_language_handling.patch
 05_translate_debian_files.patch
 autologin-session-workaround.patch
-0001-Add-support-for-usr-merge-in-the-apparmor-profile.-L.patch