merge of 885d90470dc44f85332ae3b62f38a1f1cf91b4c5

     and c9530ced58773f4fa9498d173533e73615774c22

10 files changed, 77 insertions, 37 deletions

diff --git a/packages/e17/entrance/Sessions/.mtn2git_empty b/packages/e17/entrance/Sessions/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/e17/entrance/Sessions/.mtn2git_empty
diff --git a/packages/e17/entrance/Sessions/Enlightenment b/packages/e17/entrance/Sessions/Enlightenment
new file mode 100644
index 0000000000..4d33bbb2e9
--- /dev/null
+++ b/packages/e17/entrance/Sessions/Enlightenment
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+enlightenment
+
diff --git a/packages/e17/entrance/Sessions/Failsafe b/packages/e17/entrance/Sessions/Failsafe
new file mode 100644
index 0000000000..cf4fcced12
--- /dev/null
+++ b/packages/e17/entrance/Sessions/Failsafe
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rxvt
\ No newline at end of file
diff --git a/packages/e17/entrance/Xinit.d/.mtn2git_empty b/packages/e17/entrance/Xinit.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/e17/entrance/Xinit.d/.mtn2git_empty
diff --git a/packages/e17/entrance/Xinit.d/50-calibrate b/packages/e17/entrance/Xinit.d/50-calibrate
new file mode 100644
index 0000000000..922b335c85
--- /dev/null
+++ b/packages/e17/entrance/Xinit.d/50-calibrate
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if ! test -e /etc/pointercal
+then
+	xtscal
+fi
+
diff --git a/packages/e17/entrance/Xinit.d/99-Entrance b/packages/e17/entrance/Xinit.d/99-Entrance
new file mode 100644
index 0000000000..297cc909fe
--- /dev/null
+++ b/packages/e17/entrance/Xinit.d/99-Entrance
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+entrance
+
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index 5e965057ba..874231b95b 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,5 +1,5 @@
---- entrance/data/config/build_config.sh.in~	2005-08-13 02:56:11.000000000 -0700
-+++ entrance/data/config/build_config.sh.in	2005-08-13 02:56:35.000000000 -0700
+--- entrance/data/config/build_config.sh.in~	2005-08-15 23:24:39.000000000 -0700
++++ entrance/data/config/build_config.sh.in	2005-08-15 23:25:15.000000000 -0700
 @@ -3,7 +3,7 @@
  rm -f $DB
  
@@ -9,7 +9,16 @@
  
  # uncomment the below to enable experimental OpenGL hardware acceleration
  #edb_ed $DB add /entrance/engine int 1
-@@ -25,25 +25,25 @@
+@@ -18,30 +18,30 @@
+ #edb_ed $DB add /entrance/fonts/0/str str "/usr/share/fonts/truetype/"
+ #edb_ed $DB add /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/"
+ edb_ed $DB add /entrance/greeting/before str "Welcome to "
+-edb_ed $DB add /entrance/greeting/after str ""
++edb_ed $DB add /entrance/greeting/after str " e17/OE"
+ edb_ed $DB add /entrance/session/count int 8
+-edb_ed $DB add /entrance/session/0/session str "default"
++edb_ed $DB add /entrance/session/0/session str "/etc/X11/Sessions/Default"
+ edb_ed $DB add /entrance/session/0/title str "Default"
  edb_ed $DB add /entrance/session/0/icon str "default.png"
  edb_ed $DB add /entrance/session/1/icon str "enlightenment.png"
  edb_ed $DB add /entrance/session/1/title str "Enlightenment"
@@ -30,27 +39,23 @@
 -edb_ed $DB add /entrance/session/6/title str "XFce"
 -edb_ed $DB add /entrance/session/6/icon str "xfce.png"
 -edb_ed $DB add /entrance/session/7/session str "failsafe"
--edb_ed $DB add /entrance/session/7/title str "Failsafe"
--edb_ed $DB add /entrance/session/7/icon str "failsafe.png"
-+edb_ed $DB add /entrance/session/1/session str "/etc/X11/Session/Enlightenment"
-+#edb_ed $DB add /entrance/session/2/session str "kde"
-+#edb_ed $DB add /entrance/session/2/title str "KDE"
-+#edb_ed $DB add /entrance/session/2/icon str "kde.png"
-+edb_ed $DB add /entrance/session/2/session str "/etc/X11/Session/GPE"
-+edb_ed $DB add /entrance/session/2/title str "GPE"
-+edb_ed $DB add /entrance/session/2/icon str "gnome.png"
-+#edb_ed $DB add /entrance/session/4/session str "blackbox"
-+#edb_ed $DB add /entrance/session/4/title str "Blackbox"
-+#edb_ed $DB add /entrance/session/4/icon str "blackbox.png"
-+#edb_ed $DB add /entrance/session/5/session str "sawfish"
-+#edb_ed $DB add /entrance/session/5/title str "Sawfish"
-+#edb_ed $DB add /entrance/session/5/icon str "default.png"
-+#edb_ed $DB add /entrance/session/6/session str "xfce"
-+#edb_ed $DB add /entrance/session/6/title str "XFce"
-+#edb_ed $DB add /entrance/session/6/icon str "xfce.png"
-+edb_ed $DB add /entrance/session/3/session str "/etc/X11/Session/Failsafe"
-+edb_ed $DB add /entrance/session/3/title str "Failsafe"
-+edb_ed $DB add /entrance/session/3/icon str "failsafe.png"
++edb_ed $DB add /entrance/session/2/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/2/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/2/title str "Enlightenment"
++edb_ed $DB add /entrance/session/3/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/3/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/3/title str "Enlightenment"
++edb_ed $DB add /entrance/session/4/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/4/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/4/title str "Enlightenment"
++edb_ed $DB add /entrance/session/5/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/5/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/5/title str "Enlightenment"
++edb_ed $DB add /entrance/session/6/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/6/icon str "enlightenment.png"
++edb_ed $DB add /entrance/session/6/title str "Enlightenment"
++edb_ed $DB add /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment"
++edb_ed $DB add /entrance/session/7/session str "/etc/X11/Sessions/Failsafe"
+ edb_ed $DB add /entrance/session/7/title str "Failsafe"
+ edb_ed $DB add /entrance/session/7/icon str "failsafe.png"
  edb_ed $DB add /entrance/system/reboot int 1
- edb_ed $DB add /entrance/system/halt int 1
- edb_ed $DB add /entrance/user/remember int 1
diff --git a/packages/e17/entrance/longer-sleep.patch b/packages/e17/entrance/longer-sleep.patch
deleted file mode 100644
index 66ad220de2..0000000000
--- a/packages/e17/entrance/longer-sleep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- entrance/src/client/entrance_session.c.~1.71.~	2005-05-28 02:31:14.000000000 -0700
-+++ entrance/src/client/entrance_session.c	2005-08-07 13:39:35.000000000 -0700
-@@ -454,7 +454,7 @@
-         shell = strdup("/bin/sh");
-         /* this bypasses a race condition where entrance loses its x
-            connection before the wm gets it and x goes and resets itself */
--        sleep(10);
-+        sleep(60);
-         /*
-          * FIXME These should be called!
-         ecore_x_shutdown();
diff --git a/packages/e17/entrance/run-Xinit.patch b/packages/e17/entrance/run-Xinit.patch
new file mode 100644
index 0000000000..1d6c2307f7
--- /dev/null
+++ b/packages/e17/entrance/run-Xinit.patch
@@ -0,0 +1,17 @@
+--- entrance/src/daemon/entrance_wrapper.in.~1.1.~	2003-01-31 13:57:06.000000000 -0800
++++ entrance/src/daemon/entrance_wrapper.in	2005-08-15 20:13:57.000000000 -0700
+@@ -5,8 +5,13 @@
+ 
+ test -f /etc/profile && . /etc/profile
+ 
++if [ -x /etc/X11/Xinit.d/99gpe-login ]; then
++		chmod -x /etc/X11/Xinit.d/99gpe-login
++fi
++
++/etc/X11/Xinit
++
+ exec @prefix@/bin/entrance "$@"
+ 
+ #fallback
+ exec entrance "$@"
+-
diff --git a/packages/e17/entrance/use-bash.patch b/packages/e17/entrance/use-bash.patch
new file mode 100644
index 0000000000..4d3b2f4aae
--- /dev/null
+++ b/packages/e17/entrance/use-bash.patch
@@ -0,0 +1,11 @@
+--- entrance/src/client/entrance_session.c.~1.71.~	2005-05-28 02:31:14.000000000 -0700
++++ entrance/src/client/entrance_session.c	2005-08-15 21:45:53.000000000 -0700
+@@ -451,7 +451,7 @@
+                     (int) pid);
+         }
+         _entrance_session_user_list_fix(e);
+-        shell = strdup("/bin/sh");
++        shell = strdup("/bin/bash");
+         /* this bypasses a race condition where entrance loses its x
+            connection before the wm gets it and x goes and resets itself */
+         sleep(10);