entrance: run entrance from entrance_wrapper instead of from Xinit to fix login issues

diff --git a/packages/e17/entrance/Xinit.d/.mtn2git_empty b/packages/e17/entrance/Xinit.d/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance
deleted file mode 100644 (file)
index e524443..0000000
--- a/packages/e17/entrance/Xinit.d/99entrance
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec entrance
-

diff --git a/packages/e17/entrance/run-Xinit.patch b/packages/e17/entrance/run-Xinit.patch
index 52eaae3..1d6c230 100644 (file)
--- a/packages/e17/entrance/run-Xinit.patch
+++ b/packages/e17/entrance/run-Xinit.patch
@@ -8,7 +8,7 @@
 +              chmod -x /etc/X11/Xinit.d/99gpe-login
 +fi
 +
-+exec /etc/X11/Xinit
++/etc/X11/Xinit
 +
  exec @prefix@/bin/entrance "$@"
  

diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index 6f9c2f1..c478452 100644 (file)
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -7,7 +7,7 @@ RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \
            file://Xserver.patch;patch=1 \