[Pkg-xfce-commits] r8119 - in /goodies/branches/experimental/lightdm/debian: changelog patches/01_set-default-path.patch patches/06_allow_libpamsystemd_and_ck_together.patch

[Yves-Alexis Perez]

Author: corsac
Date: Sun Dec 29 14:42:46 2013
New Revision: 8119

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8119
Log:
01_set-default-path and 06_allow_libpamsystemd_and_ck_together
refreshed.

Modified:
    goodies/branches/experimental/lightdm/debian/changelog
    goodies/branches/experimental/lightdm/debian/patches/01_set-default-path.patch
    goodies/branches/experimental/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch

Modified: goodies/branches/experimental/lightdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/lightdm/debian/changelog?rev=8119&op=diff
==============================================================================
--- goodies/branches/experimental/lightdm/debian/changelog	(original)
+++ goodies/branches/experimental/lightdm/debian/changelog	Sun Dec 29 14:42:46 2013
@@ -5,6 +5,8 @@
   * debian/patches:
     - 04_dont-add-pkglibexecdir-path dropped, gdm-flexiserver script has been
       dropped from LightDM so the PATH addition was dropped as well.
+    - 01_set-default-path and 06_allow_libpamsystemd_and_ck_together
+      refreshed.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 29 Dec 2013 15:39:12 +0100
 

Modified: goodies/branches/experimental/lightdm/debian/patches/01_set-default-path.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/lightdm/debian/patches/01_set-default-path.patch?rev=8119&op=diff
==============================================================================
--- goodies/branches/experimental/lightdm/debian/patches/01_set-default-path.patch	(original)
+++ goodies/branches/experimental/lightdm/debian/patches/01_set-default-path.patch	Sun Dec 29 14:42:46 2013
@@ -4,7 +4,7 @@
 Description: Fix default PATH environment variable
 --- a/src/seat.c
 +++ b/src/seat.c
-@@ -267,7 +267,10 @@ run_script (Seat *seat, DisplayServer *d
+@@ -274,7 +274,10 @@ run_script (Seat *seat, DisplayServer *d
          process_set_env (script, "PATH", g_getenv ("PATH"));
      }
      else
@@ -18,7 +18,7 @@
      {
 --- a/src/session-child.c
 +++ b/src/session-child.c
-@@ -355,7 +355,10 @@ session_child_run (int argc, char **argv
+@@ -354,7 +354,10 @@ session_child_run (int argc, char **argv
          else
          {
              /* Set POSIX variables */

Modified: goodies/branches/experimental/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/branches/experimental/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch?rev=8119&op=diff
==============================================================================
--- goodies/branches/experimental/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch	(original)
+++ goodies/branches/experimental/lightdm/debian/patches/06_allow_libpamsystemd_and_ck_together.patch	Sun Dec 29 14:42:46 2013
@@ -1,6 +1,6 @@
---- a/src/session.c	2013-10-30 21:41:46.000000000 +0100
-+++ b/src/session.c	2013-11-28 19:59:37.218510065 +0100
-@@ -766,8 +766,8 @@
+--- 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);
@@ -11,7 +11,7 @@
  }
  
  void
-@@ -778,7 +778,7 @@
+@@ -793,7 +793,7 @@ session_lock (Session *session)
      {
          if (session->priv->login1_session)
              login1_lock_session (session->priv->login1_session);
@@ -20,7 +20,7 @@
              ck_lock_session (session->priv->console_kit_cookie);
      }
  }
-@@ -791,7 +791,7 @@
+@@ -806,7 +806,7 @@ session_unlock (Session *session)
      {
          if (session->priv->login1_session)
              login1_unlock_session (session->priv->login1_session);
@@ -29,9 +29,9 @@
              ck_unlock_session (session->priv->console_kit_cookie);
      }
  }
---- a/src/session-child.c	2013-11-28 20:24:07.000000000 +0100
-+++ b/src/session-child.c	2013-11-28 20:01:55.738515458 +0100
-@@ -476,8 +476,8 @@
+--- 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);
      }
  
@@ -42,7 +42,7 @@
          /* 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 @@
+@@ -506,7 +506,7 @@ session_child_run (int argc, char **argv
              pam_putenv (pam_handle, value);
              g_free (value);
          }