update changelogs for Debian build

diff --git a/ChangeLog b/ChangeLog
index 024d44940b9f68ee42aafcabd882d0400eb4a44b..2a95a1ef5187370cbfeb3dfee1ed9a8bdda5b301 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+commit 99316a17a9642a207c45610e7cc1c33c2600ece0
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Aug 23 21:33:53 2011 -0600
+
+    rewind changelog to 0.9.6.0 for rebuild
+
+commit 192881b7cae49af375cc2b8b7305c937079ee724
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Tue Aug 23 20:11:01 2011 -0600
+
+    update changelogs for Debian build
+

 commit fc7e46b1215ea2b4cc138ed77d8eaa122369b15f
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Tue Aug 23 20:10:14 2011 -0600
 commit fc7e46b1215ea2b4cc138ed77d8eaa122369b15f
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Tue Aug 23 20:10:14 2011 -0600

diff --git a/debian/changelog b/debian/changelog
index e786b10f25736a678083229c71bd5eefa8c79ad4..6bec4012b9c0296c7d19633be2dfefdacc474963 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+altos (0.9.7.0) 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.
+
+  [ Bdale Garbee ]
+  * turn off auto-tagging during Debian build
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 23 Aug 2011 21:36:50 -0600
+

 altos (0.9.6.0) unstable; urgency=low
 
   [ Keith Packard ]
 altos (0.9.6.0) unstable; urgency=low
 
   [ Keith Packard ]