From: Bdale Garbee <bdale@gag.com>
Date: Wed, 29 Aug 2012 05:39:53 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.1~67
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5ed88fb72c3e3ecf3333c700d838667db71cfbdc;hp=621d0930244f25165d2ac5da596dcc87e253b965

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

Conflicts:
	debian/control
---

diff --git a/debian/control b/debian/control
index f57117ff..589e8d8f 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, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config
+Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, sdcc, xsltproc, fop, docbook-xml, docbook-xsl, swig, default-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config, libelf-dev
 Standards-Version: 3.9.3
 Homepage: http://altusmetrum.org/AltOS
 Vcs-Git: git://git.gag.com/fw/altos