From f03ed0876c67b58624abf0c14bf73444b0322d3c Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Tue, 30 Mar 2010 23:18:37 -0600
Subject: [PATCH] update changelogs for Debian build

---
 ChangeLog        | 58 +++++++++++++++++++++++++++++++++++++++++++++---
 debian/changelog | 11 +++++++--
 2 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c9e127a..c70c5929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
-<<<<<<< HEAD
+commit b41e617080fe825f7810ee5eee52ea37f7618ec6
+Merge: 28e40cc df7bda1
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Mar 30 23:15:32 2010 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+    
+    Conflicts:
+    	ChangeLog
+
+commit 28e40ccfcd80ab8764d4aa235257cea4d193a0c1
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Mar 30 23:14:47 2010 -0600
+
+    update changelogs for Debian build
+
 commit 20d4d410e0fc04fe192e309811eed6c0194fa5a8
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Tue Mar 30 23:11:40 2010 -0600
@@ -11,8 +26,45 @@ Date:   Mon Mar 15 12:04:18 2010 -0600
 
     move gbp.conf into debian/
 
-=======
->>>>>>> df7bda1f32b0049c3878c325ea0b55999f3980e3
+commit df7bda1f32b0049c3878c325ea0b55999f3980e3
+Merge: 23da4f3 a7042fe
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 12 10:38:26 2010 -0800
+
+    Merge remote branch 'origin/master'
+
+commit 23da4f3bcdd1d780c9e1f6b68ad2fb309fcae6ba
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 12 10:37:32 2010 -0800
+
+    Document the ao-dumplog '--remote' flag for radio-link downloads
+    
+    The --remote (or -R) flag uses TeleDongle to fetch data over the radio
+    command link from TeleMetrum. It's been there for a while, but the man
+    page failed to mention it.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 93df98898f8cd199ae13158bc4f65e3494c954ad
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Mar 12 10:35:12 2010 -0800
+
+    Round radio calibration value instead of truncating
+    
+    The radio calibration function in the bring-up code was truncating the
+    radio calibration value which caused the resulting frequency to
+    always measure above the target frequency, instead of trying to get as
+    close as possible. This change will result in a closer frequency
+    match, but may sometimes be below the target frequency.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a7042fe7d065d1da1252be5ad43e3c9856214dc8
+Author: Bdale Garbee <bdale@Deborah.(none)>
+Date:   Fri Mar 5 19:11:11 2010 -0800
+
+    update changelogs for Debian build
+
 commit eda5e1166a97766aa22561beaa1086ba4e19ee16
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Thu Mar 4 17:33:39 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 66e72832..75000f80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-altos (0.6+111+g20d4d41) unstable; urgency=low
+altos (0.6+117+gb41e617) unstable; urgency=low
 
+  [ Bdale Garbee ]
+  * update changelogs for Debian build
   * move gbp.conf into debian/
   * initial harness for documentation
 
- -- Bdale Garbee <bdale@gag.com>  Tue, 30 Mar 2010 23:13:02 -0600
+  [ Keith Packard ]
+  * Round radio calibration value instead of truncating
+  * Document the ao-dumplog '--remote' flag for radio-link downloads
+
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 30 Mar 2010 23:18:08 -0600
 
 altos (0.6+108+g6e61170) unstable; urgency=low
 
-- 
2.30.2