Merge remote-tracking branch 'origin/master' into multiarch

Conflicts:
	configure.ac

Fix version number and location of ao.h header

10 files changed, 144 insertions, 54 deletions

diff --git a/.gitignore b/.gitignore
index 0d36192c..1773096d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@ tags
 doc/telemetrum.fo
 doc/telemetrum.html
 doc/telemetrum.pdf
+altosui/altos-windows.log
diff --git a/ChangeLog b/ChangeLog
index 87d7951f..2711173f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,102 @@
+commit 93b8f40bb451c9ec152490d1f431ab18f8ecb7d1
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:52:55 2011 -0600
+
+    more release process doc updates
+
+commit 9451ae5e4ea6ecfa512ba93197351682d4d043dc
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:51:18 2011 -0600
+
+    update release process docs
+
+commit 01aee9ebe517ed657692e0a39a31ae0ddfb5b8b0
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:39:45 2011 -0600
+
+    update changelogs for Debian build
+
+commit bc399d97a8424a5262f66a03e3bc403f793bb337
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:38:44 2011 -0600
+
+    roll back packaging changelog for rebuild
+
+commit 13e6e799070a1469cbc2ff990379ee520b8f0e6a
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:29:58 2011 -0600
+
+    roll release notes version from 1.0 to 1.0.1
+
+commit 1d15c841ad276127edae0345bd316c30731fffbf
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:24:35 2011 -0600
+
+    ignore generated log file
+
+commit 58a74c3c3dcd01509224326cffeb67a3e809e4e6
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 10:07:15 2011 -0600
+
+    fix telemini firmware path name
+
+commit 0a92eb2fa6b213533691288d8f99d72b80312983
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 09:43:06 2011 -0600
+
+    update changelogs for Debian build
+
+commit 3cea033ec928c21b9f7b810898ed3c3cc536d2ce
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 09:41:46 2011 -0600
+
+    get ready for a 1.0.1 release
+
+commit 674231773256bacd7acb4b5718c47412e47b813f
+Merge: 08e3d54 3bfe8df
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 09:37:01 2011 -0600
+
+    Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+commit 08e3d54bacf8b38a7c33e420a0bc19bcc7acedd4
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Fri Aug 26 09:35:54 2011 -0600
+
+    moving git-buildpackage config into .git/ since it is fairly specific to
+    Bdale's build environment, and doesn't need to be in the source package
+
+commit 3bfe8df44b575ca430ffaa051e20faa955a06c03
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Aug 25 18:02:45 2011 -0700
+
+    altos: Clear callsign on initial config load
+    
+    Before being written the first time, ao_config will get set to 0xff
+    when the config storage is read. This leaves the tail of the callsign
+    filled with invalid bytes. Zero the whole thing before loading the
+    default callsign to make sure any extra bytes are set correctly.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 93ecaf7f18f8f4c15953c2e80dc9e1b20d04fdfa
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 25 15:46:30 2011 -0600
+
+    update TeleMini turnon script now that we've made a stable firmware release
+
+commit c3314dae2d3df82e188daf6ba8520cce833592c6
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 25 03:36:25 2011 -0600
+
+    use multimaint-merge to make Debian changelogs less ugly
+
+commit f9d87de0e2681c2ec5753f4fffef0e61a3a9e144
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 25 02:22:53 2011 -0600
+
+    update changelogs for Debian build
+
 commit 41998645c04a2ee856dec272b40c2dc5913291d3
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Thu Aug 25 02:16:17 2011 -0600
diff --git a/Releasing b/Releasing
index 3307b535..4d2f8e71 100644
--- a/Releasing
+++ b/Releasing
@@ -4,13 +4,14 @@ These are Bdale's notes on how to do a release.
 
 	git tag -a <version>
 
-	git-buildpackage --git-ignore-new
+	- make sure checked-out tree is "clean" so git won't complain
 
-		use --git-ignore-new so trash in checked-out tree doesn't
-		cause the build to fail!
+	git-buildpackage
 
 		at this point, we have Debian packages
 
+	git tag debian/<version>
+
 	make distclean
 
 	./autogen.sh --with-fat-dir=/home/bdale/web/altusmetrum/AltOS/releases
@@ -18,6 +19,9 @@ These are Bdale's notes on how to do a release.
 
 		this pushes packages for each platform to web site
 
+	- copy the relevant release notes file from doc/ to 
+	    /home/bdale/web/altusmetrum/AltOS/releases/<rev>
+
 	- go edit ~/web/altusmetrum/AltOS/releases/<rev>.mdwn to include
 	  release date and explicit ref to dir contents so the AltOS page
 	  shows versioned links, commit and push
@@ -26,6 +30,12 @@ These are Bdale's notes on how to do a release.
 
 		this pushes fresh documents to the web site
 
+	sudo debian/rules clean
+	git push
+	git push --tags
+
+		push commits and leave the build tree in an uncluttered state
+
 Testing before a release
 
 	To verify that a build works, the following need to be checked
diff --git a/ao-bringup/turnon_telemini b/ao-bringup/turnon_telemini
index 0cb3d029..4450d6f6 100755
--- a/ao-bringup/turnon_telemini
+++ b/ao-bringup/turnon_telemini
@@ -42,7 +42,7 @@ read FREQ
 CAL_VALUE=`nickle -e "floor(434.55 / $FREQ * 1186611 + 0.5)"`
 
 echo "Programming flash with cal value " $CAL_VALUE
-$AOLOAD -D 100 --cal $CAL_VALUE /usr/share/altos/stable/telemini-v0.1*.ihx $SERIAL
+$AOLOAD -D 100 --cal $CAL_VALUE /usr/share/altos/stable/telemini-v1.0*.ihx $SERIAL
 
 echo "Serial number "$SERIAL" programmed with RF cal value "$CAL_VALUE
 echo "Unplug and replug USB, cu to the board, confirm freq and record power"
diff --git a/debian/changelog b/debian/changelog
index 906c0ded..b9e78c8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+altos (1.0.1+3+g93b8f40) unstable; urgency=low
+
+  * update release process docs
+  * more release process doc updates
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 28 Aug 2011 13:39:31 -0600
+
+altos (1.0.1) unstable; urgency=low
+
+  [ Bdale Garbee ]
+  * use multimaint-merge to make Debian changelogs less ugly
+  * update TeleMini turnon script now that we've made a stable firmware release
+  * moving git-buildpackage config into .git/ since it is fairly specific to 
+    Bdale's build environment, and doesn't need to be in the source package
+  * get ready for a 1.0.1 release
+  * update changelogs for Debian build
+  * fix telemini firmware path name
+  * ignore generated log file
+  * roll release notes version from 1.0 to 1.0.1
+  * roll back packaging changelog for rebuild
+
+  [ Keith Packard ]
+  * altos: Clear callsign on initial config load
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 26 Aug 2011 10:39:29 -0600
+
 altos (1.0) unstable; urgency=low
 
   [ Keith Packard ]
diff --git a/debian/control b/debian/control
index 15176565..31daaf1b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.gag.com/?p=fw/altos
 
 Package: altos
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime, freetts, nickle
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime, freetts, nickle, libjfreechart-java
 Suggests: slim | gdm
 Replaces: altusmetrum-themes, slim-altusmetrum
 Conflicts: altusmetrum-themes, slim-altusmetrum
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 9561fdfe..00000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Configuration file for git-buildpackage and friends
-
-[DEFAULT]
-# the default build command:
-#builder = debuild -i\.git/ -I.git
-# the default clean command:
-cleaner = debian/rules prebuild && debuild clean
-# the default branch for upstream sources:
-upstream-branch = upstream
-# the default branch for the debian patch:
-debian-branch = master
-# the default tag formats used:
-#upstream-tag = upstream/%(version)s
-#debian-tag = debian/%(version)s
-# use pristine-tar:
-pristine-tar = True
-
-# Options only affecting git-buildpackage
-[git-buildpackage]
-#upstream-branch = dfsgclean
-# uncomment this to automatically GPG sign tags
-#sign-tags = True
-# keyid to GPG sign tags with
-#keyid = 0xdeadbeef
-# push to a remote repository after a successful tag: 
-posttag = git push --mirror
-# use this for more svn-buildpackage like behaviour:
-export-dir = ../build-area/altos/
-#tarball-dir = ../tarballs/
-
-# Options only affecting git-import-orig
-[git-import-orig]
-#upstream-branch = newupstream
-#debian-branch = dfsgclean
-#filter = .svn
-
-# Options only affecting git-import-dsc
-[git-import-dsc]
-#upstream-branch = svn-upstream
-#filter = [ 'CVS', '.cvsignore' ]
-
-# Options only affecting git-dch
-[git-dch]
-#git-log = --no-merges
-#snapshot-number = snapshot + 1
-
diff --git a/doc/Makefile b/doc/Makefile
index 35858b15..14bce5c9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,7 +7,7 @@ RELNOTES=\
 	release-notes-0.8.html \
 	release-notes-0.9.html \
 	release-notes-0.9.2.html \
-	release-notes-1.0.html
+	release-notes-1.0.1.html
 
 RELNOTES_XSL=$(RELNOTES:.html=.xsl)
 HTML=altusmetrum.html altos.html telemetry.html $(RELNOTES)
diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl
index 5a60da7a..606c8b99 100644
--- a/doc/altusmetrum.xsl
+++ b/doc/altusmetrum.xsl
@@ -2480,7 +2480,7 @@ NAR #88757, TRA #12200
   <appendix
       xmlns:xi="http://www.w3.org/2001/XInclude">
     <title>Release Notes</title>
-    <xi:include	href="release-notes-1.0.xsl"  xpointer="xpointer(/article/*)"/>
+    <xi:include	href="release-notes-1.0.1.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include	href="release-notes-0.9.2.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include	href="release-notes-0.9.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include	href="release-notes-0.8.xsl"  xpointer="xpointer(/article/*)"/>
diff --git a/doc/release-notes-1.0.xsl b/doc/release-notes-1.0.1.xsl
index 1a06a43d..1e9fcabc 100644
--- a/doc/release-notes-1.0.xsl
+++ b/doc/release-notes-1.0.1.xsl
@@ -4,7 +4,7 @@
 
 <article>
   <para>
-    Version 1.0 is a major release, adding support for the TeleMini
+    Version 1.0.1 is a major release, adding support for the TeleMini
     device and lots of new AltosUI features
   </para>
   <para>