diff -Nru blackchocobo-1.9.900/debian/bzr-builder.manifest blackchocobo-1.9.900/debian/bzr-builder.manifest --- blackchocobo-1.9.900/debian/bzr-builder.manifest 2016-04-25 01:49:43.000000000 +0000 +++ blackchocobo-1.9.900/debian/bzr-builder.manifest 2016-04-27 08:01:31.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~1268 -lp:~sithlord48/blackchocobo/trunk revid:git-v1:46eef1b5471e3609325ca2c631c7a9007db06505 +# bzr-builder format 0.3 deb-version {debupstream}-0~1269 +lp:~sithlord48/blackchocobo/trunk revid:git-v1:a58029a4174ab07d450ff68c76227502d4a282d0 diff -Nru blackchocobo-1.9.900/debian/changelog blackchocobo-1.9.900/debian/changelog --- blackchocobo-1.9.900/debian/changelog 2016-04-25 01:49:43.000000000 +0000 +++ blackchocobo-1.9.900/debian/changelog 2016-04-27 08:01:31.000000000 +0000 @@ -1,8 +1,8 @@ -blackchocobo (1.9.900-0~1268~ubuntu15.04.1) vivid; urgency=low +blackchocobo (1.9.900-0~1269~ubuntu15.04.1) vivid; urgency=low * Auto build. - -- sithlord48 Mon, 25 Apr 2016 01:49:43 +0000 + -- sithlord48 Wed, 27 Apr 2016 08:01:31 +0000 blackchocobo (1.9.900) trusty; urgency=low *New: Items Tab now Contains command buttons for keyitems and flyers for easier access. diff -Nru blackchocobo-1.9.900/.travis.yml blackchocobo-1.9.900/.travis.yml --- blackchocobo-1.9.900/.travis.yml 2016-04-25 01:49:42.000000000 +0000 +++ blackchocobo-1.9.900/.travis.yml 2016-04-27 08:01:30.000000000 +0000 @@ -3,6 +3,7 @@ os: - linux + - osx matrix: exclude: # Only do coverity or coverage build on Linux when the compiler is gcc @@ -13,13 +14,20 @@ # Don't build with clang on Linux - os: linux compiler: clang -compiler: -- gcc +# Don't build with gcc on OSX + - os: osx + compiler: gcc before_script: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then sudo apt-get -y install qt5-default qttools5-dev-tools libssl-dev; fi +- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update > /dev/null; fi +- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install qt5; fi +- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl; fi +- if [ "$TRAVIS_OS_NAME" == "osx" ]; then chmod -R 755 /usr/local/opt/qt5/*; fi +- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export QTDIR="/usr/local/opt/qt5"; fi +- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PATH="$QTDIR/bin:$PATH"; fi - $CXX --version