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

diff --git a/debian/changelog b/debian/changelog
index b9e78c8bfd7fbef043d87fa53f5742690877e2fb..6b441b2efbb2568dac8b4ea3e3a565d32a64f414 100644 (file)
--- 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 24f3916e2fbc360c81cf0dba2d3be8d4f7019123..ecb71f3af5cbe410a5fd758cd064cd7347dd988c 100644 (file)
--- 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