[Pkg-xfce-commits] r5792 - in goodies/trunk/lightdm/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-06-17 06:56:46 +0000 (Fri, 17 Jun 2011)
New Revision: 5792

Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/patches/02_default-config.patch
   goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch
Log:
prepare 0.4.0


Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-06-14 21:27:47 UTC (rev 5791)
+++ goodies/trunk/lightdm/debian/changelog	2011-06-17 06:56:46 UTC (rev 5792)
@@ -1,4 +1,4 @@
-lightdm (0.3.6-1) UNRELEASED; urgency=low
+lightdm (0.4.0-1) UNRELEASED; urgency=low
 
   * Initial release.                                            closes: #615591
 

Modified: goodies/trunk/lightdm/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch	2011-06-14 21:27:47 UTC (rev 5791)
+++ goodies/trunk/lightdm/debian/patches/02_default-config.patch	2011-06-17 06:56:46 UTC (rev 5792)
@@ -1,19 +1,27 @@
 === modified file 'data/lightdm.conf'
---- old/data/lightdm.conf	2011-04-18 05:06:03 +0000
-+++ new/data/lightdm.conf	2011-04-21 11:25:50 +0000
-@@ -9,9 +9,9 @@
- #
+Index: lightdm-0.4.0/data/lightdm.conf
+===================================================================
+--- lightdm-0.4.0.orig/data/lightdm.conf	2011-06-10 03:35:30.000000000 +0200
++++ lightdm-0.4.0/data/lightdm.conf	2011-06-17 08:04:26.074134864 +0200
+@@ -17,7 +17,7 @@
  [LightDM]
- #xserver=/usr/bin/X
+ #xserver=default-xserver
+ #default-xserver-command=
 -#authorization-directory=/var/cache/lightdm/authority
 +authorization-directory=/var/cache/lightdm/authority
  #log-directory=/var/log/lightdm
+ #theme-directory=/usr/share/lightdm/themes
+ #theme-engine-directory=/usr/libexec/lightdm
+@@ -25,7 +25,7 @@
+ #cache-directory=/var/cache/lightdm
+ #xsessions-directory=/usr/share/xsessions
+ #default-xsession=
 -#session-wrapper=/etc/X11/Xsession
 +session-wrapper=/etc/X11/Xsession
- displays=default-display
+ seats=seat-0
  
  #
-@@ -54,7 +54,7 @@
+@@ -78,7 +78,7 @@
  # hidden-shells = Shells that indicate a user cannot login
  #
  [UserManager]
@@ -22,7 +30,7 @@
  #minimum-uid=500
  #hidden-users=nobody nobody4 noaccess
  #hidden-shells=/bin/false /usr/sbin/nologin
-@@ -70,6 +70,6 @@
+@@ -106,6 +106,6 @@
  # it can be a word and the first 7 characters are used as the key.
  #
  [xdmcp]
@@ -30,4 +38,3 @@
 +enabled=false
  #port=177
  #key=0x0123456789ABCD
-

Modified: goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch	2011-06-14 21:27:47 UTC (rev 5791)
+++ goodies/trunk/lightdm/debian/patches/04_fix_xauthority-path.patch	2011-06-17 06:56:46 UTC (rev 5792)
@@ -1,8 +1,8 @@
-Index: lightdm-0.3.0/src/display-manager.c
+Index: lightdm-0.4.0/src/display-manager.c
 ===================================================================
---- lightdm-0.3.0.orig/src/display-manager.c	2011-04-16 10:16:26.000000000 +0200
-+++ lightdm-0.3.0/src/display-manager.c	2011-04-18 15:23:49.470536842 +0200
-@@ -144,14 +144,6 @@
+--- lightdm-0.4.0.orig/src/display-manager.c	2011-06-17 04:04:18.000000000 +0200
++++ lightdm-0.4.0/src/display-manager.c	2011-06-17 08:38:37.778236133 +0200
+@@ -137,14 +137,6 @@
      }
  
      authorization = xserver_get_authorization (display_get_xserver (display));
@@ -17,7 +17,7 @@
  
      if (is_greeter)
      {
-@@ -159,6 +151,14 @@
+@@ -152,11 +144,28 @@
          filename = g_strdup_printf ("%s-greeter.log", xserver_get_address (display_get_xserver (display)));
          log_filename = g_build_filename (manager->priv->log_dir, filename, NULL);
          g_free (filename);
@@ -32,18 +32,17 @@
      }
      else
      {
-@@ -172,6 +172,14 @@
-                 log_filename = g_build_filename (user_info->pw_dir, ".xsession-errors", NULL);
-             else
-                 g_warning ("Failed to get user info for user '%s'", session_get_username (session));
-+            if (authorization)
-+            {
-+                gchar *path;
+         // FIXME: Copy old error file
+         log_filename = g_build_filename (user_get_home_directory (session_get_user (session)), ".xsession-errors", NULL);
++        if (authorization)
++        {
++            gchar *path;
 +
-+                path = g_build_filename(user_info->pw_dir, ".Xauthority", NULL);
-+                session_set_authorization (session, authorization, path);
-+                g_free (path);
-+            }
-         }
++            path = g_build_filename(user_get_home_directory (session_get_user (session)), ".Xauthority", NULL);
++            session_set_authorization (session, authorization, path);
++            g_free (path);
++        }
++
      }
-   
+ 
+     if (log_filename)