From 6b7917fb6a4e420a3c3d57d555cd08f08053a4b6 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Fri, 30 Dec 2011 00:08:47 +0100 Subject: [PATCH] Don't append /etc/xdg in xdg path, already done by Xsession.d --- debian/changelog | 1 + usr/bin/startlubuntu | 2 +- usr/bin/startlubuntu-netbook | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 312c9a4..03f4e2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ lubuntu-default-settings (0.23) UNRELEASED; urgency=low * usr/bin/startlubuntu* & usr/share/lubuntu/xscreensaver/xscreensaver: - Add a custom configuration file for xscreensaver, with blank mode by default (LP: #578789). + - Don't append /etc/xdg in xdg path, already done by Xsession.d -- Julien Lavergne Tue, 15 Nov 2011 13:47:32 +0700 diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index b7b1a36..959bc5c 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -15,7 +15,7 @@ if test "x$XDG_CONFIG_DIRS" = "x" then XDG_CONFIG_DIRS="/etc/xdg/lubuntu:/etc/xdg" else - XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS:/etc/xdg" + XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS" fi export XDG_CONFIG_DIRS diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index c9743e8..3abb8e8 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -15,7 +15,7 @@ if test "x$XDG_CONFIG_DIRS" = "x" then XDG_CONFIG_DIRS="/etc/xdg/lubuntu:/etc/xdg" else - XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS:/etc/xdg" + XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS" fi export XDG_CONFIG_DIRS