[Frugalware-darcs] frugalware-current: entrance-20061124-1-i686

[voroskoi]

Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061125223657-dd049-54d672ca5a0c9015e487f939324293366563876a.gz;

[entrance-20061124-1-i686
voroskoi <voroskoi at frugalware.org>**20061125223657
 version bump (switched to cvs)
 updated session patch
 added README.Frugalware
] {
addfile ./source/e17-extra/entrance/README.Frugalware
hunk ./source/e17-extra/entrance/FrugalBuild 5
-pkgver=0.9.0.007
+pkgver=20061124
hunk ./source/e17-extra/entrance/FrugalBuild 11
-Finclude e17
-source=($url/files/$pkgname-$pkgver.tar.gz session_config.patch0)
-sha1sums=('37d8e91d1fcdd8aa198aae2a818a7c2080cdf362' \
-	'6ce351cfb7884dd8aa70ed4fc8c64aa2dc81b7eb')
+Finclude e17-cvs
+source=(${source[@]} session_config.patch0 README.Frugalware)
+backup=(etc/entrance_config.cfg)
hunk ./source/e17-extra/entrance/FrugalBuild 16
+	Fcd $pkgname
+	export NOCONFIGURE="yes"
+	./autogen.sh
hunk ./source/e17-extra/entrance/FrugalBuild 23
-
-# optimalization OK
+sha1sums=('121677b6df47b4d6873fdcea9aaa287911399b0a' \
+	  'ad6cc35ca69295aad6e6d8ee816a1f443b1dc95e' \
+	  '1c9fc761441c99a6d285d7008073e2e0adaee790')
hunk ./source/e17-extra/entrance/README.Frugalware 1
+If your keyboard doesn't work that can be because wrong
+virtual terminal number set in entrance config.
+Use the following command to set the proper value:
+
+sudo ecore_config -c /etc/entrance_config.cfg -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp vt7"
+
+In this example you want to run entrance on vt7.
hunk ./source/e17-extra/entrance/session_config.patch0 1
---- data/config/build_config.sh.in	2006-01-03 14:59:34.000000000 +0100
-+++ data/config/build_config.sh.in	2006-01-03 15:04:52.000000000 +0100
-@@ -3,7 +3,7 @@
- rm -f $DB
+--- data/config/build_config.sh.in	2006-08-29 02:29:38.000000000 +0200
++++ data/config/build_config.sh.in.new	2006-11-25 20:38:35.000000000 +0100
+@@ -44,7 +44,7 @@
+ rm -f $DB || exit 1
hunk ./source/e17-extra/entrance/session_config.patch0 12
-@@ -26,16 +26,16 @@
- ecore_config -c $DB -k /entrance/session/1/icon -s "enlightenment.png"
- ecore_config -c $DB -k /entrance/session/1/title -s "E17"
- ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment"
--ecore_config -c $DB -k /entrance/session/2/session -s "kde"
-+ecore_config -c $DB -k /entrance/session/2/session -s "/usr/bin/startkde"
- ecore_config -c $DB -k /entrance/session/2/title -s "KDE"
- ecore_config -c $DB -k /entrance/session/2/icon -s "kde.png"
--ecore_config -c $DB -k /entrance/session/3/session -s "gnome"
-+ecore_config -c $DB -k /entrance/session/3/session -s "/usr/bin/gnome-session"
- ecore_config -c $DB -k /entrance/session/3/title -s "Gnome"
- ecore_config -c $DB -k /entrance/session/3/icon -s "gnome.png"
--ecore_config -c $DB -k /entrance/session/4/session -s "Enlightenment"
-+ecore_config -c $DB -k /entrance/session/4/session -s "/usr/bin/enlightenment"
- ecore_config -c $DB -k /entrance/session/4/title -s "E16"
- ecore_config -c $DB -k /entrance/session/4/icon -s "enlightenment.png"
--ecore_config -c $DB -k /entrance/session/5/session -s "xfce"
-+ecore_config -c $DB -k /entrance/session/5/session -s "/usr/bin/startxfce4"
- ecore_config -c $DB -k /entrance/session/5/title -s "XFce"
- ecore_config -c $DB -k /entrance/session/5/icon -s "xfce.png"
- ecore_config -c $DB -k /entrance/session/6/session -s "failsafe"
+@@ -65,32 +65,32 @@
+ 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"
+-#	ecore_config -c $DB -k /entrance/session/1/title -s "E17"
+-#	ecore_config -c $DB -k /entrance/session/1/icon -s "enlightenment.png"
+-#	ecore_config -c $DB -k /entrance/session/2/session -s "kde"
+-#	ecore_config -c $DB -k /entrance/session/2/title -s "KDE"
+-#	ecore_config -c $DB -k /entrance/session/2/icon -s "kde.png"
+-#	ecore_config -c $DB -k /entrance/session/3/session -s "gnome"
+-#	ecore_config -c $DB -k /entrance/session/3/title -s "Gnome"
+-#	ecore_config -c $DB -k /entrance/session/3/icon -s "gnome.png"
+-#	ecore_config -c $DB -k /entrance/session/4/session -s "Enlightenment"
+-#	ecore_config -c $DB -k /entrance/session/4/title -s "E16"
+-#	ecore_config -c $DB -k /entrance/session/4/icon -s "enlightenment.png"
+-#	ecore_config -c $DB -k /entrance/session/5/session -s "xfce"
+-#	ecore_config -c $DB -k /entrance/session/5/title -s "XFce"
+-#	ecore_config -c $DB -k /entrance/session/5/icon -s "xfce.png"
+-#else
+-#	for f in $SESSION_DIR/* ; do
+-#		count=`(expr $count + 1)`
+-#		s=`echo $f | sed "s:^$SESSION_DIR/::"`
+-#		ecore_config -c $DB -k /entrance/session/$count/session -s "$s"
+-#		ecore_config -c $DB -k /entrance/session/$count/title -s "$s"
+-#		ecore_config -c $DB -k /entrance/session/$count/icon -s "$s.png"
+-#	done
+-#fi
++if [ -z "$SESSION_DIR" ] ; then
++	count=`(expr $count + 6)`
++	ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment_start"
++	ecore_config -c $DB -k /entrance/session/1/title -s "E17"
++	ecore_config -c $DB -k /entrance/session/1/icon -s "enlightenment.png"
++	ecore_config -c $DB -k /entrance/session/2/session -s "/usr/bin/startkde"
++	ecore_config -c $DB -k /entrance/session/2/title -s "KDE"
++	ecore_config -c $DB -k /entrance/session/2/icon -s "kde.png"
++	ecore_config -c $DB -k /entrance/session/3/session -s "/usr/bin/gnome-session"
++	ecore_config -c $DB -k /entrance/session/3/title -s "Gnome"
++	ecore_config -c $DB -k /entrance/session/3/icon -s "gnome.png"
++	ecore_config -c $DB -k /entrance/session/4/session -s "/usr/bin/enlightenment"
++	ecore_config -c $DB -k /entrance/session/4/title -s "E16"
++	ecore_config -c $DB -k /entrance/session/4/icon -s "enlightenment.png"
++	ecore_config -c $DB -k /entrance/session/5/session -s "/usr/bin/startxfce4"
++	ecore_config -c $DB -k /entrance/session/5/title -s "XFce"
++	ecore_config -c $DB -k /entrance/session/5/icon -s "xfce.png"
++else
++	for f in $SESSION_DIR/* ; do
++		count=`(expr $count + 1)`
++		s=`echo $f | sed "s:^$SESSION_DIR/::"`
++		ecore_config -c $DB -k /entrance/session/$count/session -s "$s"
++		ecore_config -c $DB -k /entrance/session/$count/title -s "$s"
++		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"
+@@ -107,5 +107,5 @@
+ ecore_config -c $DB -k /entrance/presel/mode -i 1
+ 
+ # for Entranced
+-ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp at ENTRANCE_VT_ARG@"
++ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp vt12"
+ ecore_config -c $DB -k /entranced/attempts -i 5
}