# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1334939124 -7200
# Node ID 1df511897a9c80cf80e4892b0ed7cc9406f79c25
# Parent  6aedcb2651c75d375d3851326797dae604801719
Up and improve lxde meta package (we have now lxde-session and lxde-logout script)

diff -r 6aedcb2651c7 -r 1df511897a9c lxde/receipt
--- a/lxde/receipt	Fri Apr 20 18:24:21 2012 +0200
+++ b/lxde/receipt	Fri Apr 20 18:25:24 2012 +0200
@@ -1,16 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="lxde"
-VERSION="0.3"
+VERSION="0.3.2.1"
 CATEGORY="meta"
-SHORT_DESC="LXDE desktop environement meta package."
+SHORT_DESC="LXDE desktop environement meta package with SliTaz integration."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="openbox obconf pcmanfm lxpanel lxtask lxappearance gpicview leafpad"
 WEB_SITE="http://lxde.org/"
 TAGS="wm desktop"
+SUGGESTED="lxterminal lxdm"
+
+DEPENDS="xorg-libX11 gtk+ pcmanfm lxpanel lxtask lxappearance lxsession
+lxsession-edit lxrandr openbox obconf viewnior leafpad slitaz-configs"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
+	mkdir -p $fs/usr/bin $fs/usr/share/applications
+	install -m 0755 $stuff/lxde-session $fs/usr/bin
+	install -m 0755 $stuff/lxde-logout $fs/usr/bin
+	cp -a $stuff/xsessions $fs/usr/share
+	cp -a $stuff/lxde-logout.desktop $fs/usr/share/applications
+	chown -R 0.0 $fs
 }
diff -r 6aedcb2651c7 -r 1df511897a9c lxde/stuff/lxde-logout
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lxde/stuff/lxde-logout	Fri Apr 20 18:25:24 2012 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# SliTaz LXDE Logout.
+#
+
+case "$1" in
+	*.png|*.jpg) banner="$1" ;;
+	--*|help|usage) echo "Usage: $(basename $0) [image]" && exit 0 ;;
+	*) banner="/usr/share/images/slitaz-banner.png" ;;
+esac
+
+lxsession-logout --banner "$banner" --side=top
diff -r 6aedcb2651c7 -r 1df511897a9c lxde/stuff/lxde-logout.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lxde/stuff/lxde-logout.desktop	Fri Apr 20 18:25:24 2012 +0200
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Icon=slitaz-logout
+Exec=lxde-logout
+Name=LXSession Log Out
+Name[fr]=Déconnexion de LXSession
+Name[it]=Esci LXSession
+Name[pt_BR]=Encerrar LXSessão
+Name[ru]=Выйти LXSession
+Categories=System;
+OnlyShowIn=LXDE;
diff -r 6aedcb2651c7 -r 1df511897a9c lxde/stuff/lxde-session
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lxde/stuff/lxde-session	Fri Apr 20 18:25:24 2012 +0200
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Start LXDE on SliTaz. We start dbus, make sure config files exist
+# and then start lxsession.
+#
+
+export XDG_CONFIG_HOME="$HOME/.config"
+
+# Start DBUS session.
+if [ ! "$DBUS_SESSION_BUS_ADDRESS" ]; then
+	dbus-launch --sh-syntax --exit-with-session &
+fi
+
+# PCmanFM config file. NOTE: will change with new PCmanFM
+if [ ! -f "$XDG_CONFIG_HOME/pcmanfm/main.lxde" ]; then
+	mkdir -p $XDG_CONFIG_HOME/pcmanfm
+	cp /usr/share/slitaz/lxde/pcmanfm.main \
+		$XDG_CONFIG_HOME/pcmanfm/main.lxde
+fi
+
+# Start LXSession.
+exec lxsession -s LXDE -e LXDE	
diff -r 6aedcb2651c7 -r 1df511897a9c lxde/stuff/xsessions/LXDE.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lxde/stuff/xsessions/LXDE.desktop	Fri Apr 20 18:25:24 2012 +0200
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Name=LXDE Desktop
+Name[fr]=Bureau LXDE
+Exec=lxde-session