From 07f3b88a9ad36cb2699814632375a41918ec3338 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 30 Dec 2004 20:40:06 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2004/12/30 21:29:59+01:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2004/12/30 21:29:48+01:00 dyndns.org!reenoo dbus: patch dbus' configure.in to avoid expansion of TMPDIR at build time, which results in a broken session.conf. 2004/12/30 20:12:36+00:00 nexus.co.uk!pb use gpe-appmgr as default desktop on large screen (xres >= 640) devices 2004/12/30 19:46:02+00:00 nexus.co.uk!pb add xdpyinfo 2004/12/30 19:44:53+00:00 nexus.co.uk!pb build XTest library with XRecord support BKrev: 41d467a6NnG2FS8mH53jeSlOKwjnQg --- packages/gpe-session-scripts/files/matchbox-session | 0 packages/gpe-session-scripts/gpe-session-scripts_0.62.bb | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 packages/gpe-session-scripts/files/matchbox-session (limited to 'packages/gpe-session-scripts') diff --git a/packages/gpe-session-scripts/files/matchbox-session b/packages/gpe-session-scripts/files/matchbox-session new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb index 8374cdba75..4420012098 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r4" +PR = "r5" inherit gpe @@ -7,14 +7,15 @@ DESCRIPTION = "GPE session startup scripts" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Philip Blundell " -RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap" +RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo" # more rdepends: keylaunch ipaq-sleep apmd blueprobe -DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap" +DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo" SRC_URI += "file://zaurus.sh \ file://keymap.sh \ file://change-default-applets.patch;patch=1 \ file://xdefaults.patch;patch=1 \ + file://matchbox-session \ file://shepherd.xmodmap file://simpad.xmodmap" do_install_append() { @@ -27,6 +28,8 @@ do_install_append() { if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar fi + install -d ${D}/etc/matchbox + install ${WORKDIR}/matchbox-session ${D}/etc/matchbox/session } # This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately -- cgit v1.2.3