Merge branch 'with-pdclib' of ssh://git.gag.com/scm/git/fw/altos into with-pdclib

diff --git a/Releasing b/Releasing
index ce4df7c279c177522437c4935271b295492af436..d7d7ccfdfc39fa6956c3fe7003c18a33580b6a28 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -1,6 +1,7 @@
 These are Bdale's notes on how to do a release.
 
-       - make sure there's a suitable ARM Cortex toolchain in /opt/cortex!
+       - make sure there's a suitable ARM Cortex toolchain installed, 
+         including pdclib and stlink. 
 
        git checkout master
 

diff --git a/debian/changelog b/debian/changelog
index b9e78c8bfd7fbef043d87fa53f5742690877e2fb..61bcd20f246055ed54fba46ff88b21fa0e42a695 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+altos (1.2.9) unstable; urgency=low
+
+  * test build on the with-pdclib branch
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 18 Dec 2013 11:07:28 -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