debian/changelog | 6 ++----
debian/control | 1 -
debian/local/Xsession.d/60x11-common_xdg_path | 22 ++++++++++++++++++++++
debian/local/Xsession.d/60xdg_path-on-session | 22 ----------------------
4 files changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 447c24a4aa74f5d138b33791f5e4700b1be548dc
Author: Didier Roche <didro...@ubuntu.com>
Date: Wed Jul 6 12:24:23 2011 +0200
Rename 60xdg_path-on-session to 60x11-common_xdg_path
diff --git a/debian/changelog b/debian/changelog
index 6c0a569..32ddb21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,8 @@
xorg (1:7.6+7ubuntu2) UNRELEASED; urgency=low
- * add debian/local/Xsession.d/60xdg_path-on-session to set
+ * add debian/local/Xsession.d/60x11-common_xdg_path 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
+ (compatible with lightdm, gdm and kdm now) (LP: #804734)
-- Didier Roche <didro...@ubuntu.com> Wed, 06 Jul 2011 09:39:17 +0200
diff --git a/debian/control b/debian/control
index 49b64d0..2e69ccd 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ 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/60x11-common_xdg_path
b/debian/local/Xsession.d/60x11-common_xdg_path
new file mode 100644
index 0000000..29491c3
--- /dev/null
+++ b/debian/local/Xsession.d/60x11-common_xdg_path
@@ -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
+
diff --git a/debian/local/Xsession.d/60xdg_path-on-session
b/debian/local/Xsession.d/60xdg_path-on-session
deleted file mode 100644
index 29491c3..0000000
--- a/debian/local/Xsession.d/60xdg_path-on-session
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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
-
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qeqrm-0006ni...@vasks.debian.org
