xorg: Changes to 'ubuntu'
debian/changelog | 10 ++++++++++
debian/control | 1 +
debian/local/Xsession.d/60xdg_path-on-session | 22 ++++++++++++++++++++++
3 files changed, 33 insertions(+)
New commits:
commit 2862c0aa4d4d5412afe4916720ae8806831cac75
Author: Didier Roche <didrocks@ubuntu.com>
Date: Wed Jul 6 09:40:33 2011 +0200
Set xdg path depending on selected session
diff --git a/debian/changelog b/debian/changelog
index 4b64e8b..6c0a569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg (1:7.6+7ubuntu2) UNRELEASED; urgency=low
+
+ * add debian/local/Xsession.d/60xdg_path-on-session to set
+ xdg path depending on the selected session
+ (compatible with lightdm and gdm now) (LP: #804734)
+ * debian/control:
+ - add the replaces: to gdm which contained this file
+
+ -- Didier Roche <didrocks@ubuntu.com> Wed, 06 Jul 2011 09:39:17 +0200
+
xorg (1:7.6+7ubuntu1) oneiric; urgency=low
* Merge from Debian unstable, remaining changes:
diff --git a/debian/control b/debian/control
index 2e69ccd..49b64d0 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}, lsb-base (>= 1.3-9ubuntu2)
Recommends: xdiagnose
+Replaces: gdm (<< 3.0.4-0ubuntu4)
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
diff --git a/debian/local/Xsession.d/60xdg_path-on-session b/debian/local/Xsession.d/60xdg_path-on-session
new file mode 100644
index 0000000..29491c3
--- /dev/null
+++ b/debian/local/Xsession.d/60xdg_path-on-session
@@ -0,0 +1,22 @@
+# This file is sourced by Xsession(5), not executed.
+# Add additionnal xdg paths depending on selected desktop session
+
+DEFAULT_XDG_CONFIG_DIRS='/etc/xdg'
+DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
+if [ -n "$DESKTOP_SESSION" ]; then
+ # readd default if was empty
+ if [ -z "$XDG_CONFIG_DIRS" ]; then
+ XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"
+ fi
+ XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$DESKTOP_SESSION":"$XDG_CONFIG_DIRS"
+ export XDG_CONFIG_DIRS
+ # gnome is already added if gnome-session installed
+ if [ "$DESKTOP_SESSION" != "gnome" ]; then
+ if [ -z "$XDG_DATA_DIRS" ]; then
+ XDG_DATA_DIRS="$DEFAULT_XDG_DATA_DIRS"
+ fi
+ XDG_DATA_DIRS=/usr/share/"$DESKTOP_SESSION":"$XDG_DATA_DIRS"
+ export XDG_DATA_DIRS
+ fi
+fi
+
Reply to: