From c7ba09d27fbb3ad8a52ab5615db196784eb85ce5 Mon Sep 17 00:00:00 2001 From: corsac Date: Tue, 4 Nov 2014 21:04:45 +0000 Subject: [PATCH] upload git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@8722 0c9b3bff-18ee-0310-b944-d1aa2700132f --- debian/changelog | 9 +++++++++ debian/patches/06_change-user-dirs.patch | 15 +++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d3b8181..92f1b17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +lightdm (1.10.3-3) unstable; urgency=medium + + * debian/patches: + - 06_change-user-dirs edited, don't use /var/lib/lightdm directly (it + seems to confuse lightdm and break .dmrc saving) but use + /var/lib/lightdm/data and create it at runtime. closes: #767359 + + -- Yves-Alexis Perez Tue, 04 Nov 2014 21:58:15 +0100 + lightdm (1.10.3-2) unstable; urgency=medium * debian/patches: diff --git a/debian/patches/06_change-user-dirs.patch b/debian/patches/06_change-user-dirs.patch index e749166..ae2f1f0 100644 --- a/debian/patches/06_change-user-dirs.patch +++ b/debian/patches/06_change-user-dirs.patch @@ -5,7 +5,7 @@ -I"$(top_srcdir)/common" \ -DSBIN_DIR=\"$(sbindir)\" \ - -DUSERS_DIR=\"$(localstatedir)/lib/lightdm-data\" \ -+ -DUSERS_DIR=\"$(localstatedir)/lib/lightdm\" \ ++ -DUSERS_DIR=\"$(localstatedir)/lib/lightdm/data\" \ -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \ -DRUN_DIR=\"$(localstatedir)/run/lightdm\" \ -DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \ @@ -16,7 +16,18 @@ -I"$(top_srcdir)/common" \ -DSBIN_DIR=\"$(sbindir)\" \ - -DUSERS_DIR=\"$(localstatedir)/lib/lightdm-data\" \ -+ -DUSERS_DIR=\"$(localstatedir)/lib/lightdm\" \ ++ -DUSERS_DIR=\"$(localstatedir)/lib/lightdm/data\" \ -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \ -DRUN_DIR=\"$(localstatedir)/run/lightdm\" \ -DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \ +--- a/src/shared-data-manager.c ++++ b/src/shared-data-manager.c +@@ -99,7 +99,7 @@ shared_data_manager_ensure_user_dir (Sha + + g_debug ("Creating shared data directory %s", path); + +- result = g_file_make_directory (file, NULL, &error); ++ result = g_file_make_directory_with_parents (file, NULL, &error); + if (error) + { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) -- 2.39.2