[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. a81839cd8f493ed81a7d616d41bd72dc995ef417

[Timo Jyrinki]

The following commit has been merged in the master branch:
commit a81839cd8f493ed81a7d616d41bd72dc995ef417
Author: Timo Jyrinki <timo.jyrinki at iki.fi>
Date:   Wed Mar 21 10:55:57 2012 +0200

    Switch from experimental to unstable, remove fso-gpsd, change fso-config-gtaXX -> fso-gtaXX, remove zhone, add phoneui-utils to COM task.

diff --git a/install.sh b/install.sh
index b4ca468..2839585 100755
--- a/install.sh
+++ b/install.sh
@@ -112,14 +112,14 @@ DEBIAN_EXTRA_PACKAGES=ifupdown,dropbear,udev,procps,netbase,vim-tiny,module-init
 # because of some apt-get bug, console-setup must be listed
 # before any other X.Org package, for more information see
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=435662#45
-FSO_PACKAGES="matchbox-window-manager fso-frameworkd fso-gpsd openmoko-panel-plugin dbus-x11 $TRAYER fso-utils mtd-utils \
+FSO_PACKAGES="matchbox-window-manager fso-frameworkd openmoko-panel-plugin dbus-x11 $TRAYER fso-utils mtd-utils \
 console-setup xserver-xorg-core xorg omhacks xserver-xorg-video-glamo xserver-xorg-input-tslib xterm xinit xfonts-base x11-xserver-utils"
 
 # well-suited software for the FreeRunner
 PACKAGES_TASK_AUDIO="intone"
 PACKAGES_TASK_GAMES="mokomaze sgt-puzzles"
-PACKAGES_TASK_GPS="foxtrotgps monav navit"
-PACKAGES_TASK_COM="zhone pidgin"
+PACKAGES_TASK_GPS="gpsd foxtrotgps monav navit"
+PACKAGES_TASK_COM="phoneui-apps pidgin"
 PACKAGES_TASK_NET="inetutils-ping host iptables"
 PACKAGES_TASK_TEXT="less"
 PACKAGES_TASK_WEB="midori epdfview"
@@ -323,7 +323,7 @@ ENVIRONMENT
                      mounted to (set to '$INST_DIR').
 	INST_MIRROR  the Debian mirror used during installation, it should be
                      set to a mirror nearby that carries armel binaries for
-                     unstable and experimental (set to
+                     unstable (set to
                      '$INST_MIRROR').
 	LOCALEPURGE  set this to true, if you want to install the package of the
                      same name. It reduces disk space enormously, but needs user
@@ -399,8 +399,7 @@ ENVIRONMENT
 	tasks        Installs packages for a series of tasks. Supported are
                        AUDIO  ($PACKAGES_TASK_AUDIO)
                        COM    software supporting the communication of
-                              users ($PACKAGES_TASK_COM).  zhone is always
-                              installed.
+                              users ($PACKAGES_TASK_COM). 
                        GAMES  installs games that were designed with
                               FreeRunner-like devices in mind or that have
                               been found compatible ($PACKAGES_TASK_GAMES)
@@ -1030,7 +1029,7 @@ action_apt () {
 
 	echo " * Populating /etc/apt/sources.list"
 	cat >> "$INST_DIR/etc/apt/sources.list" <<__END__
-deb $INST_MIRROR experimental main
+deb $INST_MIRROR unstable main
 deb $FSO_MIRROR unstable main
 __END__
 
@@ -1101,16 +1100,7 @@ apt-get clean
 __END_CHROOT__
 	restoring_invoke_rc_d
 
-	echo -n "* Zhone GUI: "
-	if [ "$ZHONE" = true ]; then
-		if ! chroot "$INST_DIR" apt-get $APT_OPTIONS install zhone; then
-			echo "[failed - check pkg-fso mailing list]"
-		else
-			echo "[ok]"
-		fi
-	else
-		echo "skipped (\$ZHONE=$ZHONE)"
-	fi
+	echo "skipped (\$ZHONE=$ZHONE)"
 
 	echo "I: Installing freesmartphone.org software - done"
 }
@@ -1199,8 +1189,8 @@ action_configuration () {
 
 	if [ -z "$SD_SWAP_SIZE" ]; then SD_SWAP_SIZE=0; fi
 
-	echo " * Installing the fso-config-${FSO_DEVICE} package"
-	chroot "$INST_DIR" apt-get $APT_OPTIONS install fso-config-${FSO_DEVICE}
+	echo " * Installing the fso-${FSO_DEVICE} package"
+	chroot "$INST_DIR" apt-get $APT_OPTIONS install fso-${FSO_DEVICE}
 
 	echo " * Creating /etc/X11/xorg.conf"
 	cat > "$INST_DIR/etc/X11/xorg.conf" <<__END__

-- 
Various non-packaged files