update changelogs for Debian build

diff --git a/ChangeLog b/ChangeLog
index 2a95a1ef5187370cbfeb3dfee1ed9a8bdda5b301..9d7732aa2c4027edaba29100921d8d22d785a87c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,70 @@
+commit bf6f00693c394f885d3378415dc7c8a1815a31ed
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 24 01:43:59 2011 -0600
+
+    roll changelog back in prep for another test build
+
+commit 06aee245eb74e839e50226fa2ddb967c3977fe7c
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 24 01:41:53 2011 -0600
+
+    another test round
+
+commit 4d94e8f9f807a0bbeab0cdead011e74eeca1d1b6
+Merge: 4b5369d 3b0a9a1
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 24 01:38:58 2011 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 3b0a9a1c87390747492bfef435ac8e0829ec748f
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Aug 24 00:29:36 2011 -0700
+
+    altosui: Try to get dialogs to look a little better
+    
+    grid bag constraints are not my friend.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 2165e82327faaada23f0503b8e49b80f938b746c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Aug 24 00:09:51 2011 -0700
+
+    altosui: Add tool-tips to config dialogs
+    
+    Provides more information about the various settings, and, when
+    they're disabled, tells the user why.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 63808e0392f43633f92fee137d968e969dd364c9
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Aug 23 23:20:00 2011 -0700
+
+    Remove stale tools (ao-dumplog, ao-postflight, ao-view)
+    
+    These tools have all been supplanted by altosui at this point, and
+    keeping them around increases the build dependencies by quite a lot.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 186dfc7c72aa7eba281f29f917088e49e44c2ddc
+Author: Keith Packard <keithp@keithp.com>
+Date:   Tue Aug 23 22:51:57 2011 -0700
+
+    altosui: Use system look&feel
+    
+    Turn on the 'be less ugly bit'
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4b5369dc3da2fc8441eeacbf094537b0cf52240d
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Aug 23 21:37:17 2011 -0600
+
+    update changelogs for Debian build
+
 commit 99316a17a9642a207c45610e7cc1c33c2600ece0
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Tue Aug 23 21:33:53 2011 -0600

diff --git a/debian/changelog b/debian/changelog
index e786b10f25736a678083229c71bd5eefa8c79ad4..f00e35f269fbfd1a6f2e22abbfc525767b3abd84 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+altos (0.9.7.1) unstable; urgency=low
+
+  [ Keith Packard ]
+  * altos: Lost change that reported flight 0 when log memory was full
+  * altosui: Ancient log files used 'apogee' for 'coast' state
+  * altosui: Add 'On-board Data Logging' indicator to pad tab
+  * altosui: remove debug printf in pad pane
+  * altosui: Disable 'max flight log' config when there are stored flights
+  * altos: Merge common config code in ao_config.c
+  * Bump version to 0.9.7
+  * altos/altosui: Add ability to disable telemetry/rdf completely
+  * altosui: Clean up command line processing. Add --graph
+  * altos-fat/windows: Check and install Java 1.6 as needed
+  * altosui/windows: Fix a bunch of windows compiler warnings.
+  * altosui: Attempt to make both 32- and 64-bit windows DLLs
+  * doc: Add note about telemetry disable mode to 1.0 release notes
+  * doc: Add Installation Recommendations chapter
+  * altosui: Add a few simple unit conversions
+  * altosui: Capture date/time/serial/flight in AltosFlightStats
+  * altosui: Add date/time/serial/flight to flight stats tab
+  * altosui: Show filename in AltosGraph window
+  * altosui: Add --summary option to dump flight stats to stdout
+  * altosui: Make monitor-idle display correct 'On-board data logging' status
+  * altosui: Can't configure flight log max on TeleMini
+  * altosui: fix 'magic' string to signal end of config data
+  * altosui: Only 'show' config dialog once
+  * altosui: Reset all config data on 'reset' command
+  * altosui: Update mac os X library
+  * libaltos: fix Mac OS X function signatures
+  * altosui: add tool-tips to the button box.
+  * altosui: Use system look&feel
+  * Remove stale tools (ao-dumplog, ao-postflight, ao-view)
+  * altosui: Add tool-tips to config dialogs
+  * altosui: Try to get dialogs to look a little better
+
+  [ Bdale Garbee ]
+  * turn off auto-tagging during Debian build
+  * update changelogs for Debian build
+  * rewind changelog to 0.9.6.0 for rebuild
+  * update changelogs for Debian build
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 24 Aug 2011 01:44:46 -0600
+
 altos (0.9.6.0) unstable; urgency=low
 
   [ Keith Packard ]