05_always-export-XAUTHORITY dropped, included upstream.

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

diff --git a/debian/changelog b/debian/changelog
index 20fb23b609364e2c20c6dedf0d3cde3cbe791bc8..bb92c4358bda6458509f349f532c5d1834a4a726 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ lightdm (0.9.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/patches:
     - 01_set-default-path refreshed.
+    - 05_always-export-XAUTHORITY dropped, included upstream. 
 
  -- Yves-Alexis Perez <corsac@debian.org>  Tue, 09 Aug 2011 20:55:24 +0200
 

diff --git a/debian/patches/05_always-export-XAUTHORITY.patch b/debian/patches/05_always-export-XAUTHORITY.patch
deleted file mode 100644 (file)
index f5c254d..0000000
--- a/debian/patches/05_always-export-XAUTHORITY.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/xsession.c b/src/xsession.c
-index 6474799..01cbea1 100644
---- a/src/xsession.c
-+++ b/src/xsession.c
-@@ -67,11 +67,11 @@ xsession_start (Session *session)
-             path = g_build_filename (dir, "xauthority", NULL);
-             g_free (dir);
- 
--            process_set_env (PROCESS (session), "XAUTHORITY", path);
-         }
-         else
-             path = g_build_filename (user_get_home_directory (session_get_user (session)), ".Xauthority", NULL);
- 
-+        process_set_env (PROCESS (session), "XAUTHORITY", path);
-         XSESSION (session)->priv->authority_file = g_file_new_for_path (path);
-         g_free (path);
- 

diff --git a/debian/patches/series b/debian/patches/series
index 9341fb10714dced89b4b7d5cb2182f46c94374e2..45a831d582a1f1c81bcd2ad8858fec3b1c0e0fd6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 02_default-config.patch
 03_quit-plymouth.patch
 04_default-gtk-greeter-config.patch
-05_always-export-XAUTHORITY.patch