Merge pull request #1 from bweir/master

Update from bweir

Author: Gadgetoid

.gitignore

@@ -4,6 +4,9 @@ src/propelleride/propelleride
 src/openspin/openspin
 src/p1load/p1load
 
+src/openspin/repo
+src/p1load/repo
+
 propelleride.exe
 openspin.exe
 p1load.exe
@@ -18,6 +21,9 @@ staging/
 *~
 Makefile
 *.binary
+*.plist
+*.iss
 
 .DS_Store
 .qmake.stash
+*.pyc

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/openspin/repo"]
-	path = src/openspin/repo
-	url = https://github.com/bweir/OpenSpin.git
+[submodule "packman"]
+	path = dist
+	url = https://github.com/lamestation/packman

.travis.yml

@@ -3,12 +3,16 @@ matrix:
   include:
   - compiler: gcc
 before_install:
-- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
-- sudo apt-get update -qq
-- sudo apt-get install -qq qt5-qmake qtbase5-dev zlib1g-dev cppcheck
-- qmake -qt=qt5 -v
+- sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe"
+- sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main"
+- sudo apt-get install debian-keyring debian-archive-keyring
+- sudo apt-key update
+- sudo apt-get update
+- sudo apt-get install qt5-default qt5-qmake qtbase5-dev-tools qtchooser qttools5-dev zlib1g-dev cppcheck qtbase5-dev libgles2-mesa-dev libqt5gui5 libqt5printsupport5 libqt5widgets5 libgles2-mesa libgl1-mesa-dev libgl1-mesa-glx libglapi-mesa libegl1-mesa-dev libpango-1.0-0
+- qmake -v
 script:
-- QMAKE_OPTS="-qt=qt5" make deb -j4
+- make checkout
+- make deb -j4
 after_script:
 - pushd src
 - cppcheck --enable=all -q `git ls-files *.cpp *.c`