Fixes: install the libncurses-dev and git dependencies

bin/conf.inc

@@ -2,7 +2,7 @@ PN=emacspeak_voxin_install
 
 # PV: default emacspeak version 
 PV=49.0
-REL=2
+REL=3
 GIT_EMACSPEAK_URL=https://github.com/tvraman/emacspeak.git
 GIT_EMACS_URL=https://github.com/mirrors/emacs.git
 archivesDir=$BASE/archives
@@ -117,13 +117,18 @@ debianCheckEspeak() {
 debianInstallDep() {
 	local withEmacs=$1
 	local with_X=$2
+	local emacspeakRelease=$3
     sudo apt-get update | tee -a "$LOG"
-    sudo apt-get -y install build-essential libespeak-dev libasound2-plugins libasound2-dev texinfo tcl8.6-dev tclx8.4 &>> "$LOG"
+    sudo apt-get -y install build-essential libespeak-dev libasound2-plugins libasound2-dev texinfo tcl8.6-dev tclx8.4 libncurses-dev &>> "$LOG"
+
+	if [ "$emacspeakRelease" = "latest" ] || [ -n "$withEmacs" ]; then
+		( which git || sudo apt-get -y install git ) &>> "$LOG"
+	fi
+
 	if [ -n "$withEmacs" ]; then
 		local suffix
 		[ "$with_X" = "0" ] && suffix=-nox
 		sudo apt-get -y build-dep emacs$suffix &>> "$LOG"
-	 	sudo apt-get -y install git &>> "$LOG" || true
 	fi
 }
 

bin/release.sh

@@ -8,7 +8,7 @@ DEST=$workDir/$PN-$PV-$REL
 SRC=..
 
 mkdir $DEST
-tar --exclude=.git --exclude=build --exclude="*~" -C .. -cf - . | tar -C $DEST -xf -
+tar --exclude=log --exclude=.git --exclude=build --exclude="*~" -C .. -cf - . | tar -C $DEST -xf -
 tar -C $workDir --owner=root --group=root -zcf $DEST.tgz $PN-$PV-$REL
 rm -rf $DEST
 echo $DEST.tgz

install.sh

@@ -13,7 +13,7 @@ echo "$0 $@" > "$LOG"
 
 unset CLEAN EMACS HELP emacspeakDir
 WITH_X=1
-RELEASE=$PV
+EMACSPEAK_RELEASE=$PV
 OPTIONS=`getopt -o cehnr: --long clean,emacs,help,nox,release: \
              -n "$NAME" -- "$@"`
 [ $? != 0 ] && usage && exit 1
@@ -25,7 +25,7 @@ while true; do
     -e|--emacs) EMACS=1; shift;;
     -h|--help) HELP=1; shift;;
     -n|--nox) EMACS=1; WITH_X=0; shift;;
-    -r|--release) RELEASE=$2; shift 2;;
+    -r|--release) EMACSPEAK_RELEASE=$2; shift 2;;
     --) shift; break;;
     *) break;;
   esac
@@ -35,10 +35,6 @@ done
 
 checkDistro
 
-if [ -n "$EMACS" ] || [ "$RELEASE" = "latest" ]; then
-	GIT=$(which git) || leave "git not found"
-fi
-
 voxinFound=0
 espeakFound=0
 unset DTK
@@ -72,7 +68,7 @@ trap quit ERR
 Or use this script to build the developper version of emacs ( $0 --help )." 0 )
 
 msg "Initialization; please wait... "
-$installDep $EMACS $WITH_X
+$installDep $EMACS $WITH_X "$EMACSPEAK_RELEASE"
 
 if [ -n "$EMACS" ]; then
 	msg "Downloading emacs... "
@@ -84,16 +80,16 @@ if [ -n "$EMACS" ]; then
 	gitCleanLocalCopy "$workDir"/emacs
 fi
 
-msg "Downloading emacspeak ($RELEASE)... "
-if [ "$RELEASE" = "latest" ]; then
+msg "Downloading emacspeak ($EMACSPEAK_RELEASE)... "
+if [ "$EMACSPEAK_RELEASE" = "latest" ]; then
 	downloadFromGit $workDir/emacspeak $GIT_EMACSPEAK_URL
-	[ ! -e "$workDir/emacspeak-$RELEASE" ] && ln -sf emacspeak "$workDir/emacspeak-$RELEASE"
+	[ ! -e "$workDir/emacspeak-$EMACSPEAK_RELEASE" ] && ln -sf emacspeak "$workDir/emacspeak-$EMACSPEAK_RELEASE"
 else
-	downloadEmacspeakArchive $workDir $RELEASE
+	downloadEmacspeakArchive $workDir $EMACSPEAK_RELEASE
 fi
 
 msg "Building emacspeak... "
-emacspeakDir="$workDir/emacspeak-$RELEASE"
+emacspeakDir="$workDir/emacspeak-$EMACSPEAK_RELEASE"
 buildEmacspeak "$emacspeakDir"
 
 if [ -n "$emacsAlias" ]; then