From c9ecfc0f2ec2438df7bd0a20d6d8b1a6acdd6af7 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 9 Apr 2008 10:32:10 +0000
Subject: matchbox-session-sato: start Sato components

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4216 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../matchbox-sato/etc/matchbox/session             | 15 --------
 .../matchbox-sato/matchbox-sato/matchbox-session   | 24 ------------
 meta/packages/matchbox-sato/matchbox-sato_0.1.bb   | 45 ----------------------
 .../matchbox-sato/matchbox-session-sato/session    | 15 ++++++++
 .../matchbox-sato/matchbox-session-sato_0.1.bb     | 33 ++++++++++++++++
 5 files changed, 48 insertions(+), 84 deletions(-)
 delete mode 100755 meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
 delete mode 100644 meta/packages/matchbox-sato/matchbox-sato/matchbox-session
 delete mode 100644 meta/packages/matchbox-sato/matchbox-sato_0.1.bb
 create mode 100644 meta/packages/matchbox-sato/matchbox-session-sato/session
 create mode 100644 meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb

(limited to 'meta')

diff --git a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
deleted file mode 100755
index 010772a8c4..0000000000
--- a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. /etc/formfactor/config
-
-if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
-    SHOWCURSOR="no"
-else
-    SHOWCURSOR="yes"
-fi
-
-matchbox-desktop &
-
-matchbox-panel --titlebar --start-applets showdesktop,windowselector --end-applets clock,battery,systray,startup-notify,notify &
-
-exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
diff --git a/meta/packages/matchbox-sato/matchbox-sato/matchbox-session b/meta/packages/matchbox-sato/matchbox-sato/matchbox-session
deleted file mode 100644
index 4d6caa0c5a..0000000000
--- a/meta/packages/matchbox-sato/matchbox-sato/matchbox-session
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Very simple session manager for matchbox tools
-#
-
-# Uncomment below to enable parsing of debian menu entrys
-# export MB_USE_DEB_MENUS=1 
-
-if [ -e $HOME/.matchbox/session ]
-then
-exec $HOME/.matchbox/session
-fi
-
-if [ -e /etc/matchbox/session ]
-then
-exec /etc/matchbox/session
-fi
-
-# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
-# dont exist. 
-
-matchbox-desktop &
-matchbox-panel &
-exec matchbox-window-manager $@
diff --git a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
deleted file mode 100644
index b8d6d7151a..0000000000
--- a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "Custom MB session files for poky"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts"
-RCONFLICTS = "matchbox-common"
-PR = "r21"
-
-SRC_URI = "file://etc file://matchbox-session"
-S = ${WORKDIR}
-
-inherit update-alternatives
-
-ALTERNATIVE_NAME = "x-session-manager"
-ALTERNATIVE_LINK = "${bindir}/x-session-manager"
-ALTERNATIVE_PATH = "${bindir}/matchbox-session"
-ALTERNATIVE_PRIORITY = "10"
-
-do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 ${S}/matchbox-session ${D}/${bindir}
-	cp -R ${S}/etc ${D}/etc
-	rm -fR ${D}/etc/.svn
-	rm -fR ${D}/etc/matchbox/.svn
-	chmod -R 755 ${D}/etc
-}
-
-pkg_postinst_matchbox-sato () {
-#!/bin/sh -e
-if [ "x$D" != "x" ]; then
-    exit 1
-fi
-
-. ${sysconfdir}/init.d/functions
-
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/touchscreen true
-
-if [ "`cpuinfo_id`" = "GTA01" ]
-then
-    gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 6"
-else
-    gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9"
-fi
-}
diff --git a/meta/packages/matchbox-sato/matchbox-session-sato/session b/meta/packages/matchbox-sato/matchbox-session-sato/session
new file mode 100644
index 0000000000..010772a8c4
--- /dev/null
+++ b/meta/packages/matchbox-sato/matchbox-session-sato/session
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. /etc/formfactor/config
+
+if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
+    SHOWCURSOR="no"
+else
+    SHOWCURSOR="yes"
+fi
+
+matchbox-desktop &
+
+matchbox-panel --titlebar --start-applets showdesktop,windowselector --end-applets clock,battery,systray,startup-notify,notify &
+
+exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
diff --git a/meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb
new file mode 100644
index 0000000000..e1180ad301
--- /dev/null
+++ b/meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Custom MB session files for poky"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session"
+PR = "r22"
+
+SRC_URI = "file://session"
+S = "${WORKDIR}"
+
+do_install() {
+	install -d ${D}/${sysconfdir}/matchbox
+	install -m 0755 ${S}/session ${D}/${sysconfdir}/matchbox/
+}
+
+pkg_postinst_matchbox-sato () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+. ${sysconfdir}/init.d/functions
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/touchscreen true
+
+if [ "`cpuinfo_id`" = "GTA01" ]
+then
+    gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 6"
+else
+    gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9"
+fi
+}
-- 
cgit v1.2.3