Build scripts updated.

distr/iss/InnoSetup.iss

@@ -26,7 +26,7 @@ AllowNoIcons=yes
 PrivilegesRequired=admin
 CloseApplications=yes
 OutputDir=..
-OutputBaseFilename=ScreenTranslator-{#MyAppVersion}
+OutputBaseFilename=screen-translator-{#MyAppVersion}
 SetupIconFile=icon.ico
 RestartIfNeededByRun=False
 ShowLanguageDialog=auto             

scripts/install_deps.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 sudo apt-get update -q
-sudo apt-get -y install libxcb-util0-dev fakeroot libtesseract-dev libleptonica-dev qt5-qmake libqt5webkit5-dev libqt5x11extras5-dev g++
+sudo apt-get -y install libxcb-util0-dev fakeroot libtesseract-dev libleptonica-dev qt5-qmake libqt5webkit5-dev libqt5x11extras5-dev qttools5-dev-tools g++
 #sudo apt-get -y install tesseract-ocr-eng #for testing

scripts/make_app.sh

@@ -6,7 +6,7 @@ cleanupDirInNeeded $APP_DIR
 
 cd $APP_DIR
 echo "Building app"
-lrelease $SRC_DIR/ScreenTranslator.pro
-$QMAKE -qt=qt5 "CONFIG-=debug_and_release" "CONFIG+=release" $SRC_DIR
+lrelease $QT_CHOOSER $SRC_DIR/ScreenTranslator.pro
+$QMAKE $QT_CHOOSER "CONFIG-=debug_and_release" "CONFIG+=release" $SRC_DIR
 make $JOBS
 

scripts/make_deb.sh

@@ -2,6 +2,15 @@
 
 source ./options.sh $@
 
+U_VER="15.04"
+
+for arg in ${@}; do
+  case "$arg" in
+    "15.10" ) U_VER=$arg;;
+  esac
+done
+
+
 cleanupDirInNeeded $DEB_DIR
 
 cp -r $SRC_DISTR_DIR/deb/* $DEB_DIR
@@ -42,6 +51,9 @@ sed "s/Version=.*\+/Version=$VERSION/" -i $DEB_DIR/usr/share/applications/Screen
 SIZE=$(expr `du -bs $DEB_DIR | cut -f1` / 1024)
 sed "s/Installed-Size:.*\+/Installed-Size: $SIZE/" -i $DEB_DIR/DEBIAN/control
 echo -e $(makeChangelog) > $DEB_DIR/DEBIAN/changelog
+if [ "$U_VER" == "15.10" ]; then
+  sed "s/libtesseract3/libtesseract3v5/" -i $DEB_DIR/DEBIAN/control
+fi
 
-fakeroot dpkg-deb --build $DEB_DIR $WORK_DIR/screen-translator-$VERSION.deb
+fakeroot dpkg-deb --build $DEB_DIR $WORK_DIR/screen-translator-$VERSION-$U_VER.deb
 

scripts/options.sh

@@ -5,6 +5,7 @@ set -e
 PLATFORM=linux
 CLEAN=false
 JOBS=""
+QT_CHOOSER="-qt=qt5"
 QMAKE=qmake
 QT_LIB_DIR=/usr/lib/x86_64-linux-gnu
 STRIP=strip
@@ -17,6 +18,7 @@ for arg in ${@}; do
     "-j"* ) JOBS=$arg;;
     *"qmake" ) QMAKE=$arg
       QT_LIB_DIR=`readlink -e $(dirname $arg)/../lib`
+      QT_CHOOSER=""
       ;;
   esac
 done