mjb/altos/debian/rules, branch debian/1.6.1-1 AltOS - the operating system for Altus Metrum products https://git.ethernal.org/mjb/altos/atom?h=debian%2F1.6.1-1 2014-09-10T07:29:56+00:00 use dh_installmime, which requires telling configure to stay out of the way 2014-09-10T07:29:56+00:00 Bdale Garbee bdale@gag.com 2014-09-10T07:29:56+00:00 urn:sha1:8ffc76a42ad5e3bdc7ce0529b6143f076de4a3ac Merge branch 'branch-1.4' into debian 2014-06-25T03:56:25+00:00 Bdale Garbee bdale@gag.com 2014-06-25T03:56:25+00:00 urn:sha1:27dbfb4f01f30457fccb22cfe2aba2b3b022a020 make sure to use Google Maps API key for official builds 2014-06-25T03:20:44+00:00 Bdale Garbee bdale@gag.com 2014-06-25T03:12:59+00:00 urn:sha1:42fd93b67af396b0478e9e795026cf1a5312e5c9 Merge branch 'branch-1.3' into debian 2013-12-19T08:38:40+00:00 Bdale Garbee bdale@gag.com 2013-12-19T08:38:40+00:00 urn:sha1:575bbaf976c5840fd0e308549c45a466fdec1352 Conflicts: ChangeLog altoslib/AltosRecordMM.java altosui/Makefile.am altosui/altos-windows.nsi.in configure.ac debian/changelog debian/control doc/Makefile doc/altusmetrum.xsl doc/release-notes-1.2.1.xsl doc/release-notes-1.2.xsl temporarily force stlink location in debian/rules to allow complete build 2013-12-14T01:37:29+00:00 Bdale Garbee bdale@gag.com 2013-12-14T01:37:29+00:00 urn:sha1:c94ca50fd9f24f271c160f6e0e95cb7340289354 Merge branch 'branch-1.2' into debian 2013-05-16T06:36:23+00:00 Bdale Garbee bdale@gag.com 2013-05-16T06:36:23+00:00 urn:sha1:02d111b1b53ef01fc6e9ab6c4bc60b8af1be0067 let upstream version rule, don't force use of Debian version in firmware 2012-11-20T19:36:26+00:00 Bdale Garbee bdale@gag.com 2012-11-20T19:36:26+00:00 urn:sha1:7738ddc5dcf4a9609ae2b066a783e3c9fa03d3be use non-native versioning, don't run prebuild target on this branch, update changelog 2012-09-12T04:23:24+00:00 Bdale Garbee bdale@gag.com 2012-09-12T04:23:24+00:00 urn:sha1:01eb36408d7e0e826b431fcc1d3b2deb23607e0b use multimaint-merge to make Debian changelogs less ugly 2011-08-25T09:36:25+00:00 Bdale Garbee bdale@gag.com 2011-08-25T09:36:25+00:00 urn:sha1:c3314dae2d3df82e188daf6ba8520cce833592c6 turn off auto-tagging during Debian build 2011-08-24T02:10:14+00:00 Bdale Garbee bdale@gag.com 2011-08-24T02:10:14+00:00 urn:sha1:fc7e46b1215ea2b4cc138ed77d8eaa122369b15f