summaryrefslogtreecommitdiff
path: root/packages/gpe-session-scripts
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2007-01-10 08:27:15 +0000
committerPhilipp Zabel <philipp.zabel@gmail.com>2007-01-10 08:27:15 +0000
commit16d5d68588a7c0151bccd7572a524084d608ab51 (patch)
treed20064b8b076c34f9330a68372e32a9153e6945e /packages/gpe-session-scripts
parent6f1172ac1e082bae9fc921d3f8cf2b422890427e (diff)
disapproval of revision '032fe15bf3fd23dc5d753a8cd906ce2402067a78'
Diffstat (limited to 'packages/gpe-session-scripts')
-rw-r--r--packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch11
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.67.bb5
2 files changed, 2 insertions, 14 deletions
diff --git a/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch b/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch
deleted file mode 100644
index 4bc164b646..0000000000
--- a/packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-session-scripts-0.67/gpe-auto-bluetooth.sh.orig 2006-08-31 10:12:25.000000000 +0200
-+++ gpe-session-scripts-0.67/gpe-auto-bluetooth.sh 2006-08-31 10:14:27.000000000 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
-
- # start gpe-bluetooth if hardware is built in
--if [ -f /etc/sysconfig/bluetooth ]; then
-+if [ -f /etc/sysconfig/bluetooth -a -x /usr/bin/gpe-bluetooth ]; then
- . /etc/sysconfig/bluetooth
- if [ "$BLUETOOTH" = "yes" ]; then
- exec gpe-bluetooth
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index ada40a899c..2cf63737bd 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -6,11 +6,10 @@ SECTION = "gpe"
PRIORITY = "optional"
RDEPENDS_${PN} = "matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
# more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
SRC_URI += "file://matchbox-session \
- file://disable-composite.xsettings \
- file://gpe-bluetooth-optional.patch;patch=1"
+ file://disable-composite.xsettings"
PR = "r4"