From: Bdale Garbee <bdale@gag.com>
Date: Wed, 18 Dec 2013 19:19:31 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.3~15
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6df58bb0115a8da13d35ab38861f6231bea7f2a7;hp=02195f2970fb7243fd9a9992abb6ada6709db4e1

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
---

diff --git a/debian/changelog b/debian/changelog
index b9e78c8b..6b441b2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+altos (1.2.9) unstable; urgency=low
+
+  * test builds for upcoming 1.3 release
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 18 Dec 2013 12:17:29 -0700
+
 altos (1.0.1+3+g93b8f40) unstable; urgency=low
 
   * update release process docs
diff --git a/debian/control b/debian/control
index 24f3916e..ecb71f3a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: electronics
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
 Uploaders: Keith Packard <keithp@keithp.com>
-Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev
+Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, cc1111, xsltproc, fop, xmlto, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev, libbluetooth-dev, libssl-dev, gcc-arm-none-eabi
 Standards-Version: 3.9.3
 Homepage: http://altusmetrum.org/AltOS
 Vcs-Git: git://git.gag.com/fw/altos