import clean BK tree at cset 1.3670

8 files changed, 113 insertions, 0 deletions

diff --git a/packages/gpe-dm/.mtn2git_empty b/packages/gpe-dm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-dm/.mtn2git_empty
diff --git a/packages/gpe-dm/files/.mtn2git_empty b/packages/gpe-dm/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpe-dm/files/.mtn2git_empty
diff --git a/packages/gpe-dm/files/collie-suspend-hack.patch b/packages/gpe-dm/files/collie-suspend-hack.patch
index e69de29bb2..94fc287f4e 100644
--- a/packages/gpe-dm/files/collie-suspend-hack.patch
+++ b/packages/gpe-dm/files/collie-suspend-hack.patch
@@ -0,0 +1,19 @@
+diff -urNd ../gpe-dm-0.44-r1/gpe-dm-0.44/Xserver gpe-dm-0.44/Xserver
+--- ../gpe-dm-0.44-r1/gpe-dm-0.44/Xserver	2005-02-20 17:39:31 +00:00
++++ gpe-dm-0.44/Xserver	2005-04-01 21:47:12 +01:00
+@@ -45,8 +45,14 @@
+ 	"HP iPAQ H5400" | "HP iPAQ H2200")
+ 		ARGS="$ARGS -rgba rgb" ;;
+ 	# both 'Sharp-Collie' and just 'Collie' have been reported
+-	*Collie | *Poodle)
++	*Poodle)
+ 		ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;;
++	*Collie)
++		ARGS="$ARGS -screen 320x240@270 -rgba vrgb"
++		# Horrible hack required to enable resuming after suspend
++		rm -f /dev/apm_bios
++		killall -9 apmd
++		;;
+ 	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ 		ARGS="$ARGS -rgba rgb" ;;
+ 	"Simpad")
diff --git a/packages/gpe-dm/files/mnci.patch b/packages/gpe-dm/files/mnci.patch
index e69de29bb2..8cd7358f36 100644
--- a/packages/gpe-dm/files/mnci.patch
+++ b/packages/gpe-dm/files/mnci.patch
@@ -0,0 +1,27 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- gpe-dm-0.44/gpe-dm.init~ramses
++++ gpe-dm-0.44/gpe-dm.init
+@@ -19,7 +19,7 @@
+   stop)
+         echo "Stopping GPE display manager: gpe-dm"
+         killproc /usr/bin/gpe-dm
+-	dd if=/dev/zero of=/dev/fb0 2>/dev/null
++	dd if=/dev/zero of=/dev/fb0 2>/dev/null || dd if=/dev/zero of=/dev/fb/0 2>/dev/null
+   ;;
+ 
+   *)
+--- gpe-dm-0.44/Xserver~ramses
++++ gpe-dm-0.44/Xserver
+@@ -44,6 +44,8 @@
+ 		ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;;
+ 	"HP iPAQ H5400" | "HP iPAQ H2200")
+ 		ARGS="$ARGS -rgba rgb" ;;
++	"Ramses")
++		ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;;
+ 	# both 'Sharp-Collie' and just 'Collie' have been reported
+ 	*Poodle)
+ 		ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;;
diff --git a/packages/gpe-dm/files/source-xsession-scripts.patch b/packages/gpe-dm/files/source-xsession-scripts.patch
index e69de29bb2..c92f230618 100644
--- a/packages/gpe-dm/files/source-xsession-scripts.patch
+++ b/packages/gpe-dm/files/source-xsession-scripts.patch
@@ -0,0 +1,27 @@
+--- gpe-dm-0.43/Xsession.old	2005-02-23 11:39:23.000000000 +0000
++++ gpe-dm-0.43/Xsession	2005-02-23 12:21:28.011314968 +0000
+@@ -25,4 +25,23 @@
+   SYSSESSIONDIR=/etc/X11/Xsession.d
+ fi
+ 
+-exec run-parts $SYSSESSIONDIR
++# Use run-parts to source every file in the session directory; we source
++# instead of executing so that the variables and functions defined above
++# are available to the scripts, and so that they can pass variables to each
++# other.
++
++# Can't use run-parts like this, busybox doesn't support it. Use ls instead
++#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
++
++SESSIONFILES=`ls -X $SYSSESSIONDIR`
++if [ -n "$SESSIONFILES" ]; then
++  for SESSIONFILE in $SESSIONFILES; do
++  # Test if script is executable first before sourcing it
++    if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then
++      . $SYSSESSIONDIR/$SESSIONFILE
++    fi
++  done
++fi
++
++exit 0
++
diff --git a/packages/gpe-dm/gpe-dm_0.39.bb b/packages/gpe-dm/gpe-dm_0.39.bb
index e69de29bb2..65d2c7b044 100644
--- a/packages/gpe-dm/gpe-dm_0.39.bb
+++ b/packages/gpe-dm/gpe-dm_0.39.bb
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r0"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "defaults 99"
diff --git a/packages/gpe-dm/gpe-dm_0.46.bb b/packages/gpe-dm/gpe-dm_0.46.bb
index e69de29bb2..1917c62e97 100644
--- a/packages/gpe-dm/gpe-dm_0.46.bb
+++ b/packages/gpe-dm/gpe-dm_0.46.bb
@@ -0,0 +1,14 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r0"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
+
+SRC_URI += "file://collie-suspend-hack.patch;patch=1"
diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb
index e69de29bb2..1917c62e97 100644
--- a/packages/gpe-dm/gpe-dm_0.47.bb
+++ b/packages/gpe-dm/gpe-dm_0.47.bb
@@ -0,0 +1,14 @@
+LICENSE = "GPL"
+inherit gpe update-rc.d
+
+DESCRIPTION = "GPE Desktop Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+PR = "r0"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ."
+
+SRC_URI += "file://collie-suspend-hack.patch;patch=1"