abeck70
|
143f09d216
|
Merge remote-tracking branch 'origin/rel-15.02.02' into next
Conflicts:
flight/modules/Actuator/actuator.c
|
2015-05-06 08:35:21 +10:00 |
|
Laurent Lalanne
|
5475b395e8
|
OP-1827 File encoding, "Ragin' Cajun"
|
2015-05-02 16:11:13 +02:00 |
|
samguns
|
09a00f8990
|
Merge branch 'rel-15.02.02' into samguns/zh_CN_GCS
|
2015-04-27 11:56:25 +08:00 |
|
Alessio Morale
|
ab36dcbdee
|
Merge remote-tracking branch 'origin/rel-15.02.02' into next
|
2015-04-20 14:54:07 +02:00 |
|
David Ankers
|
6eb8ff4801
|
Change uninstaller display name
|
2015-04-13 19:57:57 +10:00 |
|
James Duley
|
ccdd8e2263
|
OP-1667 removed old firmware line from windows package
|
2015-04-09 13:01:23 +12:00 |
|
James Duley
|
26266f1dee
|
OP-1790: fix up packging make dependencies
|
2015-03-18 10:18:04 +13:00 |
|
James Duley
|
feef238337
|
OP-1790: remove debain rules hack and build package without clean
|
2015-03-17 21:43:53 +13:00 |
|
James Duley
|
7c580b693f
|
OP-1790: debian package doesn't depend on package dir
|
2015-03-17 21:16:33 +13:00 |
|
James Duley
|
c24bee2e28
|
OP-1790: make packaging debug build error part of package rule
|
2015-03-17 21:15:44 +13:00 |
|
James Duley
|
0ba38d4fd2
|
Revert "OP-1695 Ubuntu PPA: actually put debs in PACKAGE_DIR"
This reverts commit 6bfe1e66a7 .
|
2015-03-17 18:14:25 +13:00 |
|
James Duley
|
7df759117e
|
OP-1790: removed "(testing - unstable)" from deb changlelog
|
2015-03-17 18:11:04 +13:00 |
|
James Duley
|
b1adc38f05
|
OP-1695 Ubuntu PPA: suppress 'which' stderr
|
2015-03-03 18:19:42 +13:00 |
|
James Duley
|
0b20faf6a3
|
OP-1695 Ubuntu PPA: added trusty suffix to DEB_REV if trusty
|
2015-03-03 15:38:37 +13:00 |
|
James Duley
|
afe0949f00
|
OP-1695 Ubuntu PPA: added check for debian distro
|
2015-03-03 13:06:53 +13:00 |
|
James Duley
|
0899403877
|
OP-1695 Ubuntu PPA: added workaround for when calling standard package rule
|
2015-03-03 13:06:53 +13:00 |
|
James Duley
|
f59512cdc1
|
OP-1695 Ubuntu PPA: added trusty depends workaround
|
2015-03-03 13:06:53 +13:00 |
|
James Duley
|
2efa05c17a
|
OP-1695 Ubuntu PPA: added runtime depends
|
2015-03-03 13:06:53 +13:00 |
|
James Duley
|
2eb5fbee8a
|
OP-1695 Ubuntu PPA: set debian section to electronics
|
2015-03-03 13:06:52 +13:00 |
|
James Duley
|
c23f7ec94c
|
OP-1695 Ubuntu PPA: add option to set debian distribution
|
2015-03-03 13:06:52 +13:00 |
|
James Duley
|
51e4f3aa0e
|
OP-1695 Ubuntu PPA: add missing build depends
|
2015-03-03 13:06:52 +13:00 |
|
James Duley
|
f611279291
|
OP-1695 Ubuntu PPA: update standards version and deb builder version
|
2015-03-03 13:06:52 +13:00 |
|
James Duley
|
716358f7ba
|
OP-1695 Ubuntu PPA: added package_src make target
|
2015-03-03 13:06:49 +13:00 |
|
James Duley
|
53e4be9bdb
|
OP-1695 Ubuntu PPA: added correct debian/control/format
|
2015-03-03 12:24:32 +13:00 |
|
James Duley
|
4410f955c1
|
OP-1695 Ubuntu PPA: made debian/rules executable
|
2015-03-03 12:24:32 +13:00 |
|
James Duley
|
9a1f155510
|
OP-1695 Ubuntu PPA: made OP modifications in package rule rather than hardcoded to debian rules file
|
2015-03-03 12:17:50 +13:00 |
|
James Duley
|
61395f44fc
|
OP-1695 Ubuntu PPA: add debian target
|
2015-03-03 12:17:50 +13:00 |
|
James Duley
|
5f1f156d10
|
OP-1695 Ubuntu PPA: check for fakeroot
|
2015-03-03 12:17:50 +13:00 |
|
James Duley
|
6bfe1e66a7
|
OP-1695 Ubuntu PPA: actually put debs in PACKAGE_DIR
|
2015-03-03 12:17:50 +13:00 |
|
Alessio Morale
|
6ed06362a7
|
Merge branch 'master' into next
|
2015-02-10 23:50:19 +01:00 |
|
Laurent Lalanne
|
105b01680d
|
Merge branch 'laurent/OP-1644_Wrong_wizard_neutral' into next
|
2015-02-07 19:03:36 +01:00 |
|
James Duley
|
3d797914a3
|
OP-1701 Fix Linux Qt config: added a resource with qt.conf which has correct prefix set
|
2015-02-03 15:51:59 +13:00 |
|
Alessio Morale
|
c2a8f8fe11
|
OP-1699 - Fix Linux build issue with tagged releases
|
2015-02-01 21:34:05 +01:00 |
|
James Duley
|
2db0724598
|
OP-1694 make package rule non-nested: moved install target to Linux.mk
|
2015-01-31 11:16:57 +13:00 |
|
James Duley
|
81d39562a8
|
OP-1694 make package rule non-nested
|
2015-01-31 11:10:13 +13:00 |
|
James Duley
|
0711f89180
|
OP-1694 make package rule non-nested: added clean alias for all_clean
|
2015-01-30 09:42:07 +13:00 |
|
James Duley
|
25c7825144
|
OP-1666 deb tidy: fix incorrect maintainer email address
|
2015-01-10 23:56:39 +13:00 |
|
James Duley
|
95fe38143f
|
OP-1666 deb tidy and OP-1663: move Qt inside OP
lib dir to avoid conflict and match Qt dir structure so their rpath is correct
|
2015-01-10 10:53:22 +13:00 |
|
James Duley
|
ea6b2dd9b6
|
OP-1666 deb tidy: added Qt to install
|
2015-01-10 00:23:16 +13:00 |
|
James Duley
|
9cc7b654af
|
OP-1666 deb tidy: changed to using dh
|
2015-01-10 00:08:24 +13:00 |
|
James Duley
|
ea0bafa27e
|
OP-1666 deb tidy: update debhelper compatibility to v9
|
2015-01-10 00:08:24 +13:00 |
|
James Duley
|
f66bcbad78
|
OP-1666 deb tidy: removed a bunch of uneeded files
|
2015-01-10 00:08:24 +13:00 |
|
James Duley
|
c013b09a8e
|
OP-1666 deb tidy: remove probably unneeded shlibs directory
|
2015-01-10 00:08:24 +13:00 |
|
James Duley
|
2a1faf6544
|
OP-1666 deb tidy: update deb changelog to sayrelease from git and change name to mine
|
2015-01-10 00:08:23 +13:00 |
|
James Duley
|
d0d025e12e
|
OP-1666 deb tidy: made version use PACKAGE_LBL
|
2015-01-10 00:08:23 +13:00 |
|
James Duley
|
931da8ecb9
|
OP-1666 deb tidy: use "dkg --print-architecture" to get arch
|
2015-01-10 00:08:23 +13:00 |
|
James Duley
|
67ecb92d90
|
OP-1666 deb tidy: made debian udev rules a symlink rather that copy
|
2015-01-10 00:08:23 +13:00 |
|
James Duley
|
f3ebed43ad
|
OP-1666_deb_tidy: removes spilt arch control file
|
2015-01-10 00:08:18 +13:00 |
|
James Duley
|
059b52597b
|
OP-1666 deb tidy: changed to using make install
|
2015-01-07 16:39:37 +13:00 |
|
James Duley
|
b45057fe89
|
OP-1666 deb tidy: remove unneeded menu stuff pt2
|
2015-01-07 16:24:56 +13:00 |
|