aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Patrin <papercrane@gmail.com>2005-08-25 17:21:51 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-25 17:21:51 +0000
commit1eb9a965791e8a7524b3d317365e0f85260cd6ae (patch)
tree4386fcd45626394f7ffa14578c09843c213190fb
parentf06e59a89c4c80c714f083e8246e0fc8c15c0776 (diff)
parent6cf3b9bc13b5453c1710651bae6afed4846c9972 (diff)
downloadopenembedded-1eb9a965791e8a7524b3d317365e0f85260cd6ae.tar.gz
merge of 2c7a585a04594ec0d49d170b8fd07f7eaaf33875
and 509d6e16b96b95f3eee23c9d533dd87c708b8d4a
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.64.bb31
-rw-r--r--packages/scap/files/scap.desktop2
-rw-r--r--packages/scap/files/scap.sh2
-rw-r--r--packages/scap/scap_0.1.bb2
4 files changed, 34 insertions, 3 deletions
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
new file mode 100644
index 0000000000..cf62a9a2d0
--- /dev/null
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
@@ -0,0 +1,31 @@
+LICENSE = "GPL"
+PR = "r0"
+
+inherit gpe
+
+DESCRIPTION = "GPE session startup scripts"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common"
+# 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 xdpyinfo x11-common"
+
+SRC_URI += "file://matchbox-session \
+ file://disable-composite.xsettings \
+ file://remove-x11-common-files.patch;patch=1"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+ if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
+ echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
+ fi
+ install -d ${D}${sysconfdir}/matchbox
+ install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
+
+ install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+ install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
+}
+
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/scap/files/scap.desktop b/packages/scap/files/scap.desktop
index 6209d8f69c..bba17259bb 100644
--- a/packages/scap/files/scap.desktop
+++ b/packages/scap/files/scap.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Online Screenshot
+Name=Upload Screenshot
Comment=Upload a screenshot to http://handhelds.org/scap
Exec=scap
Terminal=0
diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh
index f8e0485333..ba8bc7e584 100644
--- a/packages/scap/files/scap.sh
+++ b/packages/scap/files/scap.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-sleep 5
+sleep 2
if [ -x /usr/bin/bl ]; then
bl toggle
fi
diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb
index 30cf1b3299..7bef893e59 100644
--- a/packages/scap/scap_0.1.bb
+++ b/packages/scap/scap_0.1.bb
@@ -1,5 +1,5 @@
LICENSE = "OSL"
-PR = "r2"
+PR = "r4"
DESCRIPTION = "handhelds.org screen capture utility"
SRC_URI = "file://scap.sh file://scap.desktop file://scap.png"