Merge remote branch 'origin/master' into new-packet-format

6 files changed, 230 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f4ee8e6..33986884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,112 @@
+commit b6da90b4627dde1fe88240c38c51559d8f781dd0
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 11 17:15:39 2010 -0400
+
+    update changelogs for Debian build
+
+commit 4918f73fd0a0f3f5d52907f95a0ec385e901d447
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 11 08:50:27 2010 -0400
+
+    update changelogs for Debian build
+
+commit f63f16a70e4d0535667a6364cafcbff026ee6a8c
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Aug 11 08:36:59 2010 -0400
+
+    update changelogs for Debian build
+
+commit a0a9b445a4d379730b67720f8d7b682d5206a582
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 5 15:16:48 2010 -0400
+
+    update changelogs for Debian build
+
+commit e075b8623533965b1b77b77d38c2df32f5f77fce
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 5 15:16:24 2010 -0400
+
+    update changelogs for Debian build
+
+commit 410de62715a0830f03b0a65d6c7730dff51e6ef4
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 5 15:15:04 2010 -0400
+
+    add freetts as a build dep
+
+commit 0b85160c44d934f3d1352c1c07c296d01ceffc32
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 5 15:02:17 2010 -0400
+
+    update changelogs for Debian build
+
+commit d091099753d9cae01c4805812425ebea19ec09cf
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 5 15:00:46 2010 -0400
+
+    update changelogs for Debian build
+
+commit aed55ef1ce45b0f6e6fefeebf50be97607b31d65
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 5 15:00:15 2010 -0400
+
+    working on java packaging details
+
+commit 02f17f2cd26189e2676a9dc0d86bd959ed0bc3f4
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Aug 5 00:54:05 2010 -0400
+
+    move to science menu
+
+commit e3a9e3815db3f290e28b40ae02aa654f515cfc37
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sat Jul 31 10:55:27 2010 -0600
+
+    update changelogs for Debian build
+
+commit 8fc261c2b77bb8aab201a0649a84b5ffa236ce26
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Sat Jul 31 10:55:07 2010 -0600
+
+    see if my new freetts package works
+
+commit 2f114c7ff6b0deddb790d34139bb11ac37f8c0da
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Jul 29 13:30:36 2010 -0600
+
+    update changelogs for Debian build
+
+commit 7877496d47ce6d25210c0e1c6500666dbfc0876c
+Merge: c71061a 4cf39b1
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 12:07:49 2010 -0700
+
+    Merge remote branch 'origin/master'
+
+commit c71061a37d3d3be2855b61cde33d2371989d7681
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 12:06:06 2010 -0700
+
+    Make altosui test script executable
+
+commit 4cf39b13a574cb656999cf329f5b08e7f910604b
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Thu Jul 29 12:57:31 2010 -0600
+
+    update changelogs for Debian build
+
 commit d1848193d8208388e4ccdfbed4e5663a9ba04dd3
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Thu Jul 29 12:56:59 2010 -0600
 
     add a jdk to the build deps
 
+commit 9ad4984124b6c05114feac4c4ac078dc248ce16a
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 11:56:24 2010 -0700
+
+    altosui: remove option to install to alternate volume
+
 commit 2e797b18f0724caf7aaf96f45997998c7416f34e
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Thu Jul 29 12:50:57 2010 -0600
@@ -16,12 +119,24 @@ Date:   Thu Jul 29 12:47:37 2010 -0600
 
     ugh, fixing failure due to aborted build
 
+commit 6fb8546575f6d99676dbb1dce190b0b7cf24b657
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 11:45:56 2010 -0700
+
+    Moved Mac OS packaging to altosui dir
+
 commit 865d5cdf8931ffc796f608e3e12d7c5a70832825
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Thu Jul 29 12:45:18 2010 -0600
 
     add swig as a build dep
 
+commit 91d75fb3919f606a1956bf8c6423a8012d99a56a
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 11:45:12 2010 -0700
+
+    altosui: Switch eeprom extension back to .eeprom
+
 commit 33ffd89d5a64c991d28bd7369b61e1faa18f605b
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Thu Jul 29 12:40:52 2010 -0600
@@ -34,6 +149,70 @@ Date:   Thu Jul 29 12:40:25 2010 -0600
 
     update changelogs for Debian build
 
+commit 6f86db5e0360bef26b21336769b7635e3a11e160
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 11:24:47 2010 -0700
+
+    Add Mac OS X packaging bits
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 950f0a8c54e5835ee5d8b0aea360bd8362c21bc5
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 11:09:19 2010 -0700
+
+    altosui: construct Darwin application directory
+    
+    This adds the necessary files and build steps to construct
+    AltosUI.app on a Darwin system.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 669c5f52abb972a82ed6efbee7a8c7d20afb5cd0
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 10:48:52 2010 -0700
+
+    libaltos: build with java src encoding UTF8
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit efa0e034a161f4852947cbac06537d6ba4422a0e
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 10:48:25 2010 -0700
+
+    altosui: remove debug printf
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 53c279b9e96da8b69837ae84038a78ca5707f2a5
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 10:45:02 2010 -0700
+
+    altosui: Close serial, join reader thread, free altos_file
+    
+    Separating out the close and free actions ensures that the reader thread will not
+    access freed memory or dereference a null pointer while shutting down the
+    connection to the serial device. Otherwise, a race condition exists between the
+    serial close and the thread join.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit b8bc9994d8bfde6116c8a509e70ddf45fc4decce
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 10:24:59 2010 -0700
+
+    altosui: Remove unnecessary freetts .jar files
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e33dbbba94ce42295e9fed9f4ba7e46f9eff1517
+Author: Keith Packard <keithp@keithp.com>
+Date:   Thu Jul 29 10:24:09 2010 -0700
+
+    altosui: check for closed serial device before reading
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
 commit 27a2d0c00acf78628428c20ab68e2bfba06340da
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Thu Jul 29 11:02:38 2010 -0600
diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 1273e7d4..d3ecb889 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -1,6 +1,6 @@
 .SUFFIXES: .java .class
 
-CLASSPATH=classes:./*
+CLASSPATH=classes:./*:/usr/share/java/*
 CLASSFILES=\
 	Altos.class \
 	AltosChannelMenu.class \
@@ -39,16 +39,17 @@ CLASSFILES=\
 	AltosRomconfigUI.class \
 	AltosVoice.class
 
-FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
-FREETTSLIB=$(FREETTSSRC)/lib
-FREETTSJAR= \
-	cmudict04.jar \
-	cmulex.jar \
-	cmu_time_awb.jar \
-	cmutimelex.jar \
-	cmu_us_kal.jar \
-	en_us.jar \
-	freetts.jar
+#FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
+#FREETTSLIB=$(FREETTSSRC)/lib
+#FREETTSJAR=/usr/share/java/freetts.jar
+#FREETTSJAR= \
+#	cmudict04.jar \
+#	cmulex.jar \
+#	cmu_time_awb.jar \
+#	cmutimelex.jar \
+#	cmu_us_kal.jar \
+#	en_us.jar \
+#	freetts.jar
 
 JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
 
@@ -74,14 +75,14 @@ altosui.jar: classes/altosui classes/libaltosJNI $(FREETTSJAR) $(CLASSFILES) Man
 
 classes/altosui:
 	mkdir -p classes
-	ln -s .. classes/altosui
+	ln -sf .. classes/altosui
 
 classes/libaltosJNI:
 	mkdir -p classes
-	ln -s ../../libaltos/libaltosJNI classes/libaltosJNI
+	ln -sf ../../libaltos/libaltosJNI classes/libaltosJNI
 
-$(FREETTSJAR):
-	ln -s $(FREETTSLIB)/$@ .
+#$(FREETTSJAR):
+#	ln -s $(FREETTSLIB)/$@ .
 
 ifeq ($(OS),Darwin)
 RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
@@ -100,6 +101,6 @@ altosui:
 endif
 
 clean:
-	rm -f *.class $(FREETTSJAR) altosui.jar
+	rm -f *.class altosui.jar
 	rm -f AltosUI.app/Contents/Resources/Java/*
 	rm -rf classes
diff --git a/ao-tools/altosui/Manifest.txt b/ao-tools/altosui/Manifest.txt
index 251ce2a0..504d0de3 100644
--- a/ao-tools/altosui/Manifest.txt
+++ b/ao-tools/altosui/Manifest.txt
@@ -1,2 +1,2 @@
 Main-Class: altosui.AltosUI
-Class-Path: freetts.jar
+Class-Path: /usr/share/java/freetts.jar
diff --git a/debian/altos.desktop b/debian/altos.desktop
index ae9bdc63..4281ad3a 100644
--- a/debian/altos.desktop
+++ b/debian/altos.desktop
@@ -7,4 +7,4 @@ Icon=/usr/share/pixmaps/altusmetrum.xpm
 Exec=/usr/bin/ao-view %f
 Terminal=false
 MimeType=text/plain;
-Categories=Viewer;Network;
+Categories=Education;Science;
diff --git a/debian/changelog b/debian/changelog
index 8d6412f0..6a47c8a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+altos (0.6+303+gb6da90b) unstable; urgency=low
+
+  * add freetts as a build dep
+  * move to science menu
+  * working on java packaging details
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 11 Aug 2010 22:11:28 -0400
+
+altos (0.6+292+g8fc261c) unstable; urgency=low
+
+  * see if my new freetts package works
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 31 Jul 2010 10:55:21 -0600
+
+altos (0.6+290+g7877496) unstable; urgency=low
+
+  [ Keith Packard ]
+  * altosui: check for closed serial device before reading
+  * altosui: Remove unnecessary freetts .jar files
+  * altosui: Close serial, join reader thread, free altos_file
+  * altosui: remove debug printf
+  * libaltos: build with java src encoding UTF8
+  * altosui: construct Darwin application directory
+  * Add Mac OS X packaging bits
+  * altosui: Switch eeprom extension back to .eeprom
+  * Moved Mac OS packaging to altosui dir
+  * altosui: remove option to install to alternate volume
+  * Make altosui test script executable
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 29 Jul 2010 13:30:19 -0600
+
 altos (0.6+277+gd184819) unstable; urgency=low
 
   [ Bdale Garbee ]
diff --git a/debian/control b/debian/control
index ba9354b8..cc8fda94 100644
--- 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, flite1-dev, gawk, libasound2-dev, libgconf2-dev, libglade2-dev, libgtk2.0-dev, libreadline-dev, libusb-1.0-0-dev, nickle, sdcc, libplplot-dev, xsltproc, fop, docbook-xml, docbook-xsl, libsndfile1-dev, swig, openjdk-6-jdk
+Build-Depends: debhelper (>= 7), autoconf, automake, flite1-dev, gawk, libasound2-dev, libgconf2-dev, libglade2-dev, libgtk2.0-dev, libreadline-dev, libusb-1.0-0-dev, nickle, sdcc, libplplot-dev, xsltproc, fop, docbook-xml, docbook-xsl, libsndfile1-dev, swig, openjdk-6-jdk, freetts
 Standards-Version: 3.9.0
 Homepage: http://altusmetrum.org/AltOS