minor deb package cleanup

mavlink · May 22, 2016 · e399cc7 · e399cc7
1 parent 1b2ceb4
commit e399cc7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 1,683 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,7 +53,10 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - ccache
+    - debhelper
+    - devscripts
     - doxygen
+    - dput
     - espeak
     - g++-4.8
     - gcc-4.8

diff --git a/debian/changelog b/debian/changelog
diff --git a/debian/control b/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>
diff --git a/debian/rules b/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