From 68eaaa694bb7bf20642ad11eac8a13c1c8e21b7d Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 12 May 2010 16:44:14 -0600 Subject: add desktop file --- debian/altos.desktop | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 debian/altos.desktop (limited to 'debian/altos.desktop') diff --git a/debian/altos.desktop b/debian/altos.desktop new file mode 100644 index 00000000..d43f9a28 --- /dev/null +++ b/debian/altos.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=AltOS-View +GenericName=TeleMetrum-telemetry-viewer +Comment=View and log downlink data from TeleMetrum +Exec=/usr/bin/ao-view %f +Terminal=false +MultipleArgs=false +Type=Application +Icon=/usr/share/pixmaps/altusmetrum.xpm +Categories=Application;Network +MimeType=text/plain -- cgit v1.2.3 From ae6854df00579ea1c3486f1bf8f19443d5ac9498 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 12 May 2010 17:04:13 -0600 Subject: update desktop file for conformance with current standards --- debian/altos.desktop | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'debian/altos.desktop') diff --git a/debian/altos.desktop b/debian/altos.desktop index d43f9a28..8fa1247e 100644 --- a/debian/altos.desktop +++ b/debian/altos.desktop @@ -1,12 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 -Name=AltOS-View -GenericName=TeleMetrum-telemetry-viewer +Type=Application +Name="AltOS View" +GenericName="TeleMetrum Telemetry Viewer" Comment=View and log downlink data from TeleMetrum +Icon=/usr/share/pixmaps/altusmetrum.xpm Exec=/usr/bin/ao-view %f Terminal=false -MultipleArgs=false -Type=Application -Icon=/usr/share/pixmaps/altusmetrum.xpm -Categories=Application;Network -MimeType=text/plain +MimeType=text/plain; +Categories=Viewer;Network; -- cgit v1.2.3 From 6bd85138c1bfbc1d8b78dce1501870a65a64db36 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 12 May 2010 19:53:40 -0600 Subject: lose the quotes since they apparently aren't necessary --- debian/altos.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/altos.desktop') diff --git a/debian/altos.desktop b/debian/altos.desktop index 8fa1247e..ae9bdc63 100644 --- a/debian/altos.desktop +++ b/debian/altos.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application -Name="AltOS View" -GenericName="TeleMetrum Telemetry Viewer" +Name=AltOS View +GenericName=TeleMetrum Telemetry Viewer Comment=View and log downlink data from TeleMetrum Icon=/usr/share/pixmaps/altusmetrum.xpm Exec=/usr/bin/ao-view %f -- cgit v1.2.3 From 2007288da8a83e3aa925e11cc196f1c65aab2e5c Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Aug 2010 15:00:15 -0400 Subject: working on java packaging details --- ao-tools/altosui/Makefile | 33 +++++++++++++++++---------------- debian/altos.desktop | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) (limited to 'debian/altos.desktop') diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index 541b89e3..63359fbb 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 \ @@ -31,16 +31,17 @@ CLASSFILES=\ AltosDeviceDialog.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 @@ -66,14 +67,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 @@ -92,6 +93,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/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; -- cgit v1.2.3 From 5cc933039e4763b8675611c63b6147b42878a2bb Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 12:16:19 -0600 Subject: fix permissions on installed jar file, switch from ao-view to altosui in the desktop file --- ao-tools/altosui/Makefile | 4 ++-- ao-tools/altosui/altosui.1 | 44 ++++++++++++++++++++++++++++++++++++++++++++ debian/altos.desktop | 4 ++-- 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 ao-tools/altosui/altosui.1 (limited to 'debian/altos.desktop') diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index 73bc230d..101954db 100644 --- a/ao-tools/altosui/Makefile +++ b/ao-tools/altosui/Makefile @@ -100,8 +100,8 @@ altosui: chmod +x ./altosui install: altosui.jar altosui - /usr/bin/install -c altosui.jar $(DESTDIR)/usr/share/java/altosui.jar - /usr/bin/install -c altosui $(DESTDIR)/usr/bin/altosui + /usr/bin/install -m 0644 altosui.jar $(DESTDIR)/usr/share/java/altosui.jar + /usr/bin/install altosui $(DESTDIR)/usr/bin/altosui endif 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 +.\" +.\" 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/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; -- cgit v1.2.3 From 3ec03792adebbeadc9c0d4985c6f51877e8ab969 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 25 Aug 2011 01:48:11 -0600 Subject: update desktop file for consistency with package section --- debian/altos.desktop | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/altos.desktop') diff --git a/debian/altos.desktop b/debian/altos.desktop index 4345cf09..a74ecafa 100644 --- a/debian/altos.desktop +++ b/debian/altos.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Type=Application Name=AltOS UI -GenericName=TeleMetrum Telemetry Viewer -Comment=View and log downlink data from TeleMetrum +GenericName=Altus Metrum Ground Station +Comment=View and log downlink data from Altus Metrum products Icon=/usr/share/pixmaps/altusmetrum.xpm Exec=/usr/bin/altosui %f Terminal=false MimeType=text/plain; -Categories=Education;Science; +Categories=Electronics;Science; -- cgit v1.2.3 From 0579bd5de9e7686d227a16951dd520439ca5472b Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 25 Aug 2011 01:55:32 -0600 Subject: we need a main category in the desktop file --- debian/altos.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/altos.desktop') diff --git a/debian/altos.desktop b/debian/altos.desktop index a74ecafa..88b99f97 100644 --- a/debian/altos.desktop +++ b/debian/altos.desktop @@ -7,4 +7,4 @@ Icon=/usr/share/pixmaps/altusmetrum.xpm Exec=/usr/bin/altosui %f Terminal=false MimeType=text/plain; -Categories=Electronics;Science; +Categories=Education;Electronics;Science; -- cgit v1.2.3