From: corsac <corsac@0c9b3bff-18ee-0310-b944-d1aa2700132f>
Date: Mon, 15 Sep 2014 11:04:37 +0000 (+0000)
Subject: * debian/patches:
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/debian/lightdm.git/commitdiff_plain/be9ca8b0da0f409143885cecff3ebc75d41f07d5

* debian/patches:
  - 06_allow_libpamsystemd_and_ck_together dropped, ConsoleKit is now
    deprecated (wether we're using init=systemd or not).

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8584 0c9b3bff-18ee-0310-b944-d1aa2700132f
---

diff --git a/debian/changelog b/debian/changelog
index f9ac829..82142c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ lightdm (1.10.1-4) UNRELEASED; urgency=medium
   * debian/lightdm.service:
     - add an [Install] section so systemctl can toggle the service.
                                                                 closes: #752932
+  * debian/patches:
+    - 06_allow_libpamsystemd_and_ck_together dropped, ConsoleKit is now
+      deprecated (wether we're using init=systemd or not).
 
  -- Yves-Alexis Perez <corsac@debian.org>  Sat, 28 Jun 2014 10:40:07 +0200
 
diff --git a/debian/patches/06_allow_libpamsystemd_and_ck_together.patch b/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
deleted file mode 100644
index 897a081..0000000
--- a/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/src/session.c
-+++ b/src/session.c
-@@ -781,8 +781,8 @@ session_real_run (Session *session)
- 
-     if (login1_is_running ())
-         session->priv->login1_session = read_string_from_child (session);
--    if (!session->priv->login1_session)
--        session->priv->console_kit_cookie = read_string_from_child (session);
-+
-+    session->priv->console_kit_cookie = read_string_from_child (session);
- }
- 
- void
-@@ -793,7 +793,7 @@ session_lock (Session *session)
-     {
-         if (session->priv->login1_session)
-             login1_lock_session (session->priv->login1_session);
--        else if (session->priv->console_kit_cookie)
-+        if (session->priv->console_kit_cookie)
-             ck_lock_session (session->priv->console_kit_cookie);
-     }
- }
-@@ -806,7 +806,7 @@ session_unlock (Session *session)
-     {
-         if (session->priv->login1_session)
-             login1_unlock_session (session->priv->login1_session);
--        else if (session->priv->console_kit_cookie)
-+        if (session->priv->console_kit_cookie)
-             ck_unlock_session (session->priv->console_kit_cookie);
-     }
- }
---- a/src/session-child.c
-+++ b/src/session-child.c
-@@ -476,8 +476,8 @@ session_child_run (int argc, char **argv
-         write_string (login1_session);
-     }
- 
--    if (!login1_session)
--    {
-+
-+
-         /* Open a Console Kit session */
-         g_variant_builder_init (&ck_parameters, G_VARIANT_TYPE ("(a(sv))"));
-         g_variant_builder_open (&ck_parameters, G_VARIANT_TYPE ("a(sv)"));
-@@ -506,7 +506,7 @@ session_child_run (int argc, char **argv
-             pam_putenv (pam_handle, value);
-             g_free (value);
-         }
--    }
-+
- 
-     /* Write X authority */
-     if (x_authority)
diff --git a/debian/patches/series b/debian/patches/series
index ea9e4a5..f3822c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_set-default-path.patch
 02_fix-apparmor-profile.patch
 05_debianize-pam-files.patch
-06_allow_libpamsystemd_and_ck_together.patch