From: Bdale Garbee <bdale@gag.com>
Date: Wed, 15 Jul 2015 22:43:50 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.6.1~1^2~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=643c2fb03833d658320f476ef731bbb06fe3cc31;hp=271f56a41c7e785b0fab7e572325df842d104277

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

diff --git a/debian/control b/debian/control
index f3a37ed0..c9b0fa83 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ 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, gcc-arm-none-eabi, icoutils, librsvg2-bin, icnsutils, graphicsmagick | imagemagick, netpbm, shared-mime-info, libgtk-3-bin
 Standards-Version: 3.9.5
 Homepage: http://altusmetrum.org/AltOS
-Vcs-Git: git://git.gag.com/fw/altos
+Vcs-Git: git://git.gag.com/fw/altos -b debian
 Vcs-Browser: http://git.gag.com/?p=fw/altos
 
 Package: altos