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

diff --git a/ChangeLog b/ChangeLog
index 2a95a1ef5187370cbfeb3dfee1ed9a8bdda5b301..79be2032ee13d344d8cafcfc24fea1b2994cc81b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+commit 1d286dab223e6c44a25180f944ccb5ba8ed9d5f5
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 24 01:51:54 2011 -0600
+
+    prepare for another rebuild
+
+commit 82634eae16f9691a6c70a48d0858a399814631f2
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 24 01:50:56 2011 -0600
+
+    add pkg-config to the build deps
+
+commit cf2823cab40aa450375c108bae8ed6b051fbefe5
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 24 01:45:28 2011 -0600
+
+    update changelogs for Debian build
+
+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/configure.ac b/configure.ac
index 0a6001b853a2e4aa36f038d98e01c41061c1eb54..9f386680e17841d6f0814d32379923d12966285d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 0.9.7.0)
+AC_INIT([altos], 0.9.7.1)
 AC_CONFIG_SRCDIR([src/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

diff --git a/debian/changelog b/debian/changelog
index 6bec4012b9c0296c7d19633be2dfefdacc474963..e870885c1960592ca9d5e3c9ac253d16581f5187 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-altos (0.9.7.0) unstable; urgency=low
+altos (0.9.7.1) unstable; urgency=low
 
   [ Keith Packard ]
   * altos: Lost change that reported flight 0 when log memory was full
@@ -31,8 +31,24 @@ altos (0.9.7.0) unstable; urgency=low
 
   [ 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
+
+  [ Keith Packard ]
+  * 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 ]
+  * another test round
+  * roll changelog back in prep for another test build
+  * update changelogs for Debian build
+  * add pkg-config to the build deps
+  * prepare for another rebuild
 
- -- Bdale Garbee <bdale@gag.com>  Tue, 23 Aug 2011 21:36:50 -0600
+ -- Bdale Garbee <bdale@gag.com>  Wed, 24 Aug 2011 01:52:35 -0600
 
 altos (0.9.6.0) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index f784a7020e8928d997d491f6ea9c0c139d3ea212..beac70dcd6dc1a715360d2d4d5574397e0076fbe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: otherosfs
 Priority: extra
 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, sdcc, xsltproc, fop, docbook-xml, docbook-xsl, swig, openjdk-6-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev
+Build-Depends: debhelper (>= 7), autoconf, automake, gawk, libreadline-dev, libusb-1.0-0-dev, nickle, sdcc, xsltproc, fop, docbook-xml, docbook-xsl, swig, openjdk-6-jdk, freetts, libtool, libjfreechart-java, libbluetooth-dev, pkg-config
 Standards-Version: 3.9.2
 Homepage: http://altusmetrum.org/AltOS