- drop obsolete files

Changed files:
    entrance-conf.in.patch -> 1.5
    entrance-use_bash.patch -> 1.3
    entrance.gen-conf -> 1.7

diff --git a/entrance-conf.in.patch b/entrance-conf.in.patch
deleted file mode 100644 (file)
index 32acaa9..0000000
--- a/entrance-conf.in.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- entrance-0.9.0.009/data/config/build_config.sh.in.orig     2006-09-05 02:36:29.000000000 +0200
-+++ entrance-0.9.0.009/data/config/build_config.sh.in  2007-09-09 18:35:23.325602997 +0200
-@@ -19,7 +19,7 @@
- }
- 
- SESSION_DIR=""
--DB="./entrance_config.cfg"
-+DB="/var/lib/entrance/entrance_config.cfg"
- 
- while [ -n "$1" ] ; do
-       case $1 in
-@@ -61,10 +61,10 @@
- ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
- ecore_config -c $DB -k /entrance/greeting/after -s ""
- 
--count=0
--ecore_config -c $DB -k /entrance/session/0/session -s "default"
--ecore_config -c $DB -k /entrance/session/0/title -s "Default"
--ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
-+#count=0
-+#ecore_config -c $DB -k /entrance/session/0/session -s "default"
-+#ecore_config -c $DB -k /entrance/session/0/title -s "Default"
-+#ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
- #if [ -z "$SESSION_DIR" ] ; then
- #     count=`(expr $count + 6)`
- #     ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment"
-@@ -91,12 +91,27 @@
- #             ecore_config -c $DB -k /entrance/session/$count/icon -s "$s.png"
- #     done
- #fi
--count=`(expr $count + 1)`
--ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe"
--ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
--ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
--count=`(expr $count + 1)`
--ecore_config -c $DB -k /entrance/session/count -i $count
-+#count=`(expr $count + 1)`
-+#ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe"
-+#ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
-+#ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
-+#count=`(expr $count + 1)`
-+#ecore_config -c $DB -k /entrance/session/count -i $count
-+
-+ecore_config -c $DB -k /entrance/session/count -i @COUNT@
-+# lines starting with ^#session: will be parsed for each .desktop file
-+# in /usr/share/xsessions where:
-+# @SESSION@   is Exec=(*)
-+# @TITLE@     is Name=(*)
-+# @ICON@      is entrance icon if exist, or default 
-+#                     see /usr/share/entrance/images/sessions/
-+# everything will be in /tmp/sessions
-+
-+#session:ecore_config -c $DB -k /entrance/session/@NUM@/session -s "@SESSION@"
-+#session:ecore_config -c $DB -k /entrance/session/@NUM@/title -s "@TITLE@"
-+#session:ecore_config -c $DB -k /entrance/session/@NUM@/icon -s "@ICON@"
-+
-+. /var/lib/entrance/sessions
- 
- ecore_config -c $DB -k /entrance/system/reboot -i 1
- ecore_config -c $DB -k /entrance/system/halt -i 1
---- entrance/data/Makefile.am  2003-10-22 13:29:59.000000000 +0200
-+++ entrance/data/Makefile.am.new      2005-01-08 15:50:12.962107936 +0100
-@@ -1,2 +1,2 @@
--SUBDIRS = config images themes fonts users
-+SUBDIRS = images themes fonts users
-

diff --git a/entrance-use_bash.patch b/entrance-use_bash.patch
deleted file mode 100644 (file)
index de493b9..0000000
--- a/entrance-use_bash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- entrance-0.9.0.009/src/client/entrance_session.c.orig      2007-04-03 13:36:51.000000000 +0200
-+++ entrance-0.9.0.009/src/client/entrance_session.c   2007-09-09 18:38:09.567076559 +0200
-@@ -854,7 +854,7 @@
-    if (shell && (strlen(shell) > 0))
-       shell_cmd = shell;
-    else
--      shell_cmd = strdup("/bin/sh");
-+      shell_cmd = strdup("/bin/bash");
- 
-    if (session_name)
-       snprintf(buf, sizeof(buf), "%s %s", session_cmd, session_name);
-@@ -871,7 +871,7 @@
-       syslog(LOG_NOTICE,
-              "Neither '%s' or '/bin/sh' are working login shells for user '%s'. Your session may not function properly. ",
-              shell, user);
--      shell_cmd = strdup("/bin/sh");
-+      shell_cmd = strdup("/bin/bash");
-    
-    res = execlp(shell_cmd, shell_cmd, "-c", buf, NULL);
- 

diff --git a/entrance.gen-conf b/entrance.gen-conf
deleted file mode 100644 (file)
index 34aacb1..0000000
--- a/entrance.gen-conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# simple script that generates entrance config using build_config.sh.in
-# and .desktop files from /usr/share/xsessions
-
-CONFIGIN="/etc/X11/entrance/build_config.sh.in"
-WORKDIR="/var/lib/entrance"
-CONFIGOUT="$WORKDIR/build_config.sh"
-SESSIONS="$WORKDIR/sessions"
-ICONDIR="/usr/share/entrance/images/sessions"
-THEMEDIR="/usr/share/entrance/themes"
-
-die() {
-       echo "$2" >&2
-       exit $1
-}
-[ -f $CONFIGIN -a -r $CONFIGIN ] || \
-       die 1 "No config file $CONFIGIN, or not readable"
-
-[ -d /usr/share/xsessions ] || die 2 "No xsessions dir"
-
-# two common desktops
-cat << EOF > $WORKDIR/default.desktop
-Name=Default
-Exec=default
-EOF
-cat << EOF > $WORKDIR/failsafe.desktop
-Name=Failsafe
-Exec=failsafe
-EOF
-
-
-SESSION_SRTING="$(grep -E "^#session:" $CONFIGIN | sed 's/^#session://')"
-
-: > $SESSIONS
-NUM=0
-for DESKTOP in $WORKDIR/default.desktop /usr/share/xsessions/*.desktop \
-       $WORKDIR/failsafe.desktop; do
-
-       EXEC=$(grep -E "^Exec=" $DESKTOP | sed 's/^Exec=//' )
-       [ -n "$EXEC" ] || ( echo "Skipping $DESKTOP !!!" >&2; continue )
-       [ -n "$(which $EXEC 2>/dev/null)" ] && EXEC=$(which $EXEC)
-       EXEC=$(echo $EXEC | sed 's_/_\\/_g')
-       
-       NAME="$(grep -E "^Name=" $DESKTOP | sed 's/^Name=//' | \
-               sed 's_/_\\/_g')"
-       [ -n "$NAME" ] || NAME="$EXEC"
-
-       ICON="$(basename $DESKTOP .desktop).png"
-       [ -r $ICONDIR/$ICON ] || ICON=default.png
-
-       echo "$SESSION_SRTING" | \
-               sed -e "s/@NUM@/$NUM/g" -e "s/@SESSION@/$EXEC/g" \
-                   -e "s/@TITLE@/$NAME/g" -e "s/@ICON@/$ICON/g" >> $SESSIONS
-       NUM=$(($NUM+1))
-done
-
-THEME=$(grep entrance/theme $CONFIGIN | sed 's/.*\s//; s/"//g')
-OLDT=
-NEWT=
-if ! [ -r $THEMEDIR/$THEME ]; then
-       OLDT=$(grep entrance/theme $CONFIGIN | sed 's/.*\s//')
-       NEWT=$(ls $THEMEDIR | head -n 1)        
-fi
-
-sed -e "s/@auth_mode@/1/" -e "s/@COUNT@/$NUM/" -e "s/$OLDT/$NEWT/" $CONFIGIN > $CONFIGOUT
-chmod 755 $CONFIGOUT
-exec $CONFIGOUT