Merge branch 'bdale'

Conflicts:
	debian/control

6 files changed, 59 insertions, 4 deletions

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index d3ecb889..22752d5d 100644
--- a/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@ -96,8 +96,14 @@ endif
 ifeq ($(OS),Linux)
 altosui:
 	echo "#!/bin/sh" > $@
-	echo "exec java -Djava.library.path=../libaltos -jar altosui.jar" >> $@
+	echo "exec java -Djava.library.path=/usr/lib/altos/libaltos -jar /usr/share/java/altosui.jar" >> $@
 	chmod +x ./altosui
+
+install:	altosui.jar altosui
+	/usr/bin/install -m 0644 altosui.jar $(DESTDIR)/usr/share/java/altosui.jar
+	/usr/bin/install -m 0644 altosui.1 $(DESTDIR)/usr/share/man/man1/altosui.1
+	/usr/bin/install altosui $(DESTDIR)/usr/bin/altosui
+	
 endif
 
 clean:
diff --git a/ao-tools/altosui/altosui.1 b/ao-tools/altosui/altosui.1
new file mode 100644
index 00000000..c3130fce
--- /dev/null
+++ b/ao-tools/altosui/altosui.1
@@ -0,0 +1,44 @@
+.\"
+.\" Copyright © 2010 Bdale Garbee <bdale@gag.com>
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+.\" General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
+.\" with this program; if not, write to the Free Software Foundation, Inc.,
+.\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+.\"
+.\"
+.TH AO-VIEW 1 "altosui" ""
+.SH NAME
+altosui \- Rocket flight monitor
+.SH SYNOPSIS
+.B "altosui"
+.SH DESCRIPTION
+.I altosui
+connects to a TeleDongle or TeleMetrum device through a USB serial device.
+It provides a user interface to monitor, record and review rocket flight data.
+.SH USAGE
+When connected to a TeleDongle device, altosui turns on the radio
+receiver and listens for telemetry packets. It displays the received
+telemetry data, and reports flight status via voice synthesis. All
+received telemetry information is recorded to a file.
+.P
+When connected to a TeleMetrum device, altosui downloads the eeprom
+data and stores it in a file.
+.SH FILES
+All data log files are recorded into a user-specified directory
+(default ~/AltOS). Files are named using the current date, the serial
+number of the reporting device, the flight number recorded in the data
+and either '.telem' for telemetry data or '.eeprom' for eeprom data.
+.SH "SEE ALSO"
+ao-view(1), ao-load(1), ao-eeprom(1)
+.SH AUTHOR
+Keith Packard
diff --git a/ao-tools/libaltos/Makefile b/ao-tools/libaltos/Makefile
index a251e54e..cd96fd5f 100644
--- a/ao-tools/libaltos/Makefile
+++ b/ao-tools/libaltos/Makefile
@@ -14,6 +14,9 @@ OS_LDFLAGS=
 LIBNAME=libaltos.so
 EXEEXT=
 
+install:	$(LIBNAME)
+	/usr/bin/install -c $(LIBNAME) $(DESTDIR)/usr/lib/altos/$(LIBNAME)
+
 endif
 
 #
diff --git a/debian/altos.desktop b/debian/altos.desktop
index 4281ad3a..4345cf09 100644
--- a/debian/altos.desktop
+++ b/debian/altos.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Application
-Name=AltOS View
+Name=AltOS UI
 GenericName=TeleMetrum Telemetry Viewer
 Comment=View and log downlink data from TeleMetrum
 Icon=/usr/share/pixmaps/altusmetrum.xpm
-Exec=/usr/bin/ao-view %f
+Exec=/usr/bin/altosui %f
 Terminal=false
 MimeType=text/plain;
 Categories=Education;Science;
diff --git a/debian/control b/debian/control
index cc8fda94..f2bd1914 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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, freetts
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://altusmetrum.org/AltOS
 
 Package: altos
diff --git a/debian/dirs b/debian/dirs
index db75fea7..7b4dffb8 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,7 +1,9 @@
 etc/apt/sources.list.d
 usr/bin
+usr/lib/altos
 usr/share/altos
 usr/share/applications
 usr/share/gdm/themes/altusmetrum
+usr/share/java
 usr/share/pixmaps
 usr/share/slim/themes/altusmetrum