minor deb package cleanup

.travis.yml

@@ -53,7 +53,10 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - ccache
+    - debhelper
+    - devscripts
     - doxygen
+    - dput
     - espeak
     - g++-4.8
     - gcc-4.8

debian/changelog

-qgroundcontrol (2.4-0ubuntu1) trusty; urgency=low
-
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-
- -- Daniel Agar <daniel@agar.ca>  Sat, 04 Apr 2015 17:14:10 -0400

debian/control

@@ -2,14 +2,12 @@ Source: qgroundcontrol
 Section: electronics
 Priority: optional
 Maintainer: Daniel Agar <daniel@agar.ca>
-Build-Depends: debhelper (>= 9), qt54tools, qt54base, qt54declarative, qt54serialport, qt54svg, qt54webkit, qt54quickcontrols, qt54xmlpatterns, qt54x11extras, qt54websockets, qt54sensors, qt54script, qt54quick1, qt54qbs, qt54multimedia, qt54location, qt54imageformats, qt54graphicaleffects, qt54creator, qt54connectivity, libsdl1.2-dev, libudev-dev
+Build-Depends: debhelper (>= 9), qt55tools, qt55base, qt55declarative, qt55serialport, qt55svg, qt55webkit, qt55quickcontrols, qt55xmlpatterns, qt55x11extras, qt55websockets, qt55sensors, qt55script, qt55quick1, qt55qbs, qt55multimedia, qt55location, qt55imageformats, qt55graphicaleffects, qt55creator, qt55connectivity, espeak, libespeak-dev, libudev-dev, libsdl1.2-dev
 Standards-Version: 3.9.5
 Homepage: https://github.com/mavlink/qgroundcontrol
 Vcs-Git: git://github.com/mavlink/qgroundcontrol.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/qgroundcontrol.git;a=summary
 
 Package: qgroundcontrol
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qt54tools, qt54base, qt54declarative, qt54serialport, qt54svg, qt54webkit, qt54quickcontrols, qt54xmlpatterns, qt54x11extras, qt54websockets, qt54sensors, qt54script, qt54quick1, qt54multimedia, qt54location, qt54imageformats, qt54graphicaleffects, qt54connectivity
+Depends: ${shlibs:Depends}, ${misc:Depends}, espeak, libsdl1.2debian
 Description: Open Source Micro Air Vehicle Ground Control Station
- <insert long description, indented with spaces>

debian/rules

@@ -9,4 +9,4 @@ export DH_VERBOSE=1
 	dh $@ 
 
 override_dh_auto_configure:
-	/opt/qt54/bin/qmake qgroundcontrol.pro
+	/opt/qt55/bin/qmake -r qgroundcontrol.pro CONFIG+=installer CONFIG+=WarningsAsErrorsOn

deploy/ubuntu_ppa

@@ -8,21 +8,18 @@ version=${long_version:1}
 dir_version=${short_version:1}
 echo $version
 
-debchange -v ${version} --distribution trusty
+debchange -v ${version} --distribution trusty --package qgroundcontrol --create --empty
 
-qmake -r qgroundcontrol.pro
-make git_ver
-
-rsync -av --delete --exclude={.git,build-release,release,Makefile\*} . ${tmpdir}/qgroundcontrol-${dir_version}/
+rsync -a --delete --exclude={build-release,release,Makefile\*} . ${tmpdir}/qgroundcontrol-${dir_version}/
 
 cd ${tmpdir}
 tar pczf qgroundcontrol_${dir_version}.orig.tar.gz qgroundcontrol-${dir_version}
 
 cd ${tmpdir}/qgroundcontrol-${dir_version}/
-debuild -S
-
-dput ppa:qgroundcontrol/ppa ${tmpdir}/qgroundcontrol_${version}_source.changes
+debuild -S -uc -us
 
+# build locally
+debuild --prepend-path=/usr/lib/ccache -uc -us -sa -B -i -I -j4
 
-# test building the source deb locally
-#debuild --prepend-path=/usr/lib/ccache -sa
+# upload to launchpad
+#dput -f ppa:qgroundcontrol/ppa ${tmpdir}/qgroundcontrol_${version}_source.changes