[Pkg-xfce-commits] r7882 - in /desktop/trunk/xfce4-session/debian: 55xfce4-session changelog defaults.list xfce4-session.dirs xfce4-session.install xfce4-session.links

[pkg-xfce-devel at lists.alioth.debian.org]

Author: corsac
Date: Sun Aug 25 13:40:33 2013
New Revision: 7882

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=7882
Log:
include patch from Mark Hymers to add /u/s/xfce4 to XDG_DATA_DIRS

Added:
    desktop/trunk/xfce4-session/debian/55xfce4-session
    desktop/trunk/xfce4-session/debian/defaults.list
    desktop/trunk/xfce4-session/debian/xfce4-session.dirs
    desktop/trunk/xfce4-session/debian/xfce4-session.links
Modified:
    desktop/trunk/xfce4-session/debian/changelog
    desktop/trunk/xfce4-session/debian/xfce4-session.install

Added: desktop/trunk/xfce4-session/debian/55xfce4-session
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/55xfce4-session?rev=7882&op=file
==============================================================================
--- desktop/trunk/xfce4-session/debian/55xfce4-session	(added)
+++ desktop/trunk/xfce4-session/debian/55xfce4-session	Sun Aug 25 13:40:33 2013
@@ -0,0 +1,18 @@
+# For Xfce, we add a directory to XDG_DATA_DIRS
+# to allow the admin to set, for example, defaults.list properly
+BASESTARTUP=$(basename "$STARTUP" | cut -d\  -f1)
+if [ "$BASESTARTUP" = x-session-manager ]; then
+    BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
+fi
+case "$BASESTARTUP" in
+  xfce4-session)
+    # We prepend /usr/share/xfce4 since its defaults.list actually points 
+    # to /etc so it is configurable.
+    if [ -z "$XDG_DATA_DIRS" ]; then
+      XDG_DATA_DIRS=/usr/share/xfce4:/usr/local/share/:/usr/share/
+    else
+      XDG_DATA_DIRS=/usr/share/xfce4:"$XDG_DATA_DIRS"
+    fi
+    export XDG_DATA_DIRS
+    ;;
+esac

Modified: desktop/trunk/xfce4-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/changelog?rev=7882&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/changelog	(original)
+++ desktop/trunk/xfce4-session/debian/changelog	Sun Aug 25 13:40:33 2013
@@ -1,8 +1,12 @@
 xfce4-session (4.10.1-2) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 21:55:58 +0200
+  [ Mark Hymers ]
+  * Add /usr/share/xfce4 to XDG_DATA_DIRS and add defaults.list symlink
+
+ -- Mark Hymers <mhy at debian.org>  Fri, 26 Jul 2013 23:22:28 +0100
 
 xfce4-session (4.10.1-1) unstable; urgency=low
 

Added: desktop/trunk/xfce4-session/debian/defaults.list
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/defaults.list?rev=7882&op=file
==============================================================================
--- desktop/trunk/xfce4-session/debian/defaults.list	(added)
+++ desktop/trunk/xfce4-session/debian/defaults.list	Sun Aug 25 13:40:33 2013
@@ -0,0 +1 @@
+[Default Applications]

Added: desktop/trunk/xfce4-session/debian/xfce4-session.dirs
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/xfce4-session.dirs?rev=7882&op=file
==============================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.dirs	(added)
+++ desktop/trunk/xfce4-session/debian/xfce4-session.dirs	Sun Aug 25 13:40:33 2013
@@ -0,0 +1,2 @@
+etc/xfce4
+etc/X11/Xsession.d

Modified: desktop/trunk/xfce4-session/debian/xfce4-session.install
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/xfce4-session.install?rev=7882&op=diff
==============================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.install	(original)
+++ desktop/trunk/xfce4-session/debian/xfce4-session.install	Sun Aug 25 13:40:33 2013
@@ -1,2 +1,4 @@
 usr
 etc
+debian/defaults.list etc/xfce4/
+debian/55xfce4-session etc/X11/Xsession.d/

Added: desktop/trunk/xfce4-session/debian/xfce4-session.links
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/debian/xfce4-session.links?rev=7882&op=file
==============================================================================
--- desktop/trunk/xfce4-session/debian/xfce4-session.links	(added)
+++ desktop/trunk/xfce4-session/debian/xfce4-session.links	Sun Aug 25 13:40:33 2013
@@ -0,0 +1 @@
+etc/xfce4/defaults.list usr/share/xfce4/applications/defaults.list