merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

9 files changed, 44 insertions, 98 deletions

diff --git a/packages/gpe-dm/files/.mtn2git_empty b/packages/gpe-dm/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-dm/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-dm/files/Xserver-cxk.patch b/packages/gpe-dm/files/Xserver-cxk.patch
deleted file mode 100644
index 89187a0e31..0000000000
--- a/packages/gpe-dm/files/Xserver-cxk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-dm-0.47/Xserver~	2005-07-29 11:58:59.000000000 -0700
-+++ gpe-dm-0.47/Xserver	2005-08-01 11:20:42.000000000 -0700
-@@ -62,6 +62,8 @@
- 		;;
- 	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
- 		ARGS="$ARGS -rgba rgb" ;;
-+	"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
-+		ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
- 	"Simpad")
- 		ARGS="$ARGS -rgba rgb" ;;
- 	"Generic OMAP1510/1610/1710")
diff --git a/packages/gpe-dm/files/collie-suspend-hack.patch b/packages/gpe-dm/files/collie-suspend-hack.patch
deleted file mode 100644
index 94fc287f4e..0000000000
--- a/packages/gpe-dm/files/collie-suspend-hack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 8cd7358f36..0000000000
--- a/packages/gpe-dm/files/mnci.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#
-# 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/remove-X-scripts.patch b/packages/gpe-dm/files/remove-X-scripts.patch
deleted file mode 100644
index b3c85be788..0000000000
--- a/packages/gpe-dm/files/remove-X-scripts.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur gpe-dm-0.47~/Makefile gpe-dm-0.47/Makefile
---- gpe-dm-0.47~/Makefile	2005-08-19 18:27:54.000000000 -0700
-+++ gpe-dm-0.47/Makefile	2005-08-19 18:28:37.000000000 -0700
-@@ -31,10 +31,6 @@
- 	install -d $(DESTDIR)/etc/init.d
- 	install -d $(DESTDIR)/etc/rc2.d
- 	install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm
--	install -d $(DESTDIR)/etc/X11
--	install Xsession $(DESTDIR)/etc/X11/Xsession
--	install Xinit $(DESTDIR)/etc/X11/Xinit
--	install Xserver $(DESTDIR)/etc/X11/Xserver
- 
- clean: clean-po
- 	rm -f gpe-dm gpe-dm.o
diff --git a/packages/gpe-dm/files/source-xsession-scripts.patch b/packages/gpe-dm/files/source-xsession-scripts.patch
deleted file mode 100644
index c92f230618..0000000000
--- a/packages/gpe-dm/files/source-xsession-scripts.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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.50.bb b/packages/gpe-dm/gpe-dm_0.50.bb
new file mode 100644
index 0000000000..d9ac68c257
--- /dev/null
+++ b/packages/gpe-dm/gpe-dm_0.50.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "GPE Display Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xserver-common"
+RDEPENDS_${PN} += "procps xserver-common"
+
+GPE_TARBALL_SUFFIX ?= "bz2"
+
+inherit gpe autotools update-rc.d
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
diff --git a/packages/gpe-dm/gpe-dm_0.51.bb b/packages/gpe-dm/gpe-dm_0.51.bb
new file mode 100644
index 0000000000..6cf1f002a0
--- /dev/null
+++ b/packages/gpe-dm/gpe-dm_0.51.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "GPE Display Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xserver-common"
+RDEPENDS_${PN} += " xserver-common"
+
+GPE_TARBALL_SUFFIX ?= "bz2"
+
+inherit gpe autotools update-rc.d
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
diff --git a/packages/gpe-dm/gpe-dm_svn.bb b/packages/gpe-dm/gpe-dm_svn.bb
new file mode 100644
index 0000000000..1b1409f29a
--- /dev/null
+++ b/packages/gpe-dm/gpe-dm_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "GPE Display Manager"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xserver-common"
+RDEPENDS_${PN} += "procps xserver-common"
+PV = "gpe-dm-0.50+svn-${SRCDATE}"
+
+inherit gpe autotools update-rc.d
+
+SRC_URI = "${GPE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+INITSCRIPT_NAME = "gpe-dm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+
+DEFAULT_PREFERENCE = "-1"