v1.1.7

gillesdegottex · Jul 10, 2016 · fe7f1a8 · fe7f1a8
1 parent 4e54f61
commit fe7f1a8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,24 +32,22 @@ before_install:
     - export TRAVIS_TAG=`git describe --tags --exact-match HEAD 2>/dev/null`
     - echo $TRAVIS_TAG
     #- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository --yes ppa:beineri/opt-qt521 && sudo apt-get update -qq; fi
-
     - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa && sudo apt-get update -qq; fi
-
-    #- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa; fi
-    #- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; fi
 
 install:
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install --yes qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev; fi
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install --yes qt5-default qttools5-dev-tools qtmobility-dev qtmultimedia5-dev libqt5svg5-dev; fi
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install --yes libfftw3-dev libpulse-dev; fi
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install --yes libasound2-dev; fi
-    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install --yes cvs libtool; fi
     #- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
          #sudo apt-get install qt52base qt52declarative qt52webkit-examples
       #&& sudo apt-get install qt52tools qt52multimedia qt52svg
       #&& sudo apt-get install libfftw3-dev libpulse-dev libasound2-dev
       #&& sudo apt-get install cvs libtool
       #; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+         sudo apt-get install --yes qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev
+      && sudo apt-get install --yes qt5-default qttools5-dev-tools qtmobility-dev qtmultimedia5-dev libqt5svg5-dev
+      && sudo apt-get install --yes libfftw3-dev libpulse-dev
+      && sudo apt-get install --yes libasound2-dev
+      && sudo apt-get install --yes cvs libtool
+      ; fi
     - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
          brew install fftw
       && brew install qt5

diff --git a/README.txt b/README.txt
@@ -1,6 +1,6 @@
                                    FMIT
                         Free Music Instrument Tuner
-                              Version 1.1.6
+                              Version 1.1.7
                    http://gillesdegottex.github.io/fmit/
 
 FMIT is a graphical utility for tuning your musical instruments, with error

diff --git a/distrib/package_deb.Depends_Ubuntu_14.04 b/distrib/package_deb.Depends_Ubuntu_14.04
@@ -1 +1 @@
-libc6, libfftw3-double3, libgcc1, libgl1-mesa-glx, libqt5core5a, libqt5gui5, libqt5multimedia5, libqt5opengl5, libqt5widgets5, libstdc++6
+chefdk, libc6, libfftw3-double3, libgcc1, libgl1-mesa-glx, libqt5core5a, libqt5gui5, libqt5multimedia5, libqt5opengl5, libqt5widgets5, libstdc++6, libasound2