From 44b26dd550eef789e70082ccaa46d7d430c67bce Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Aug 2010 15:15:04 -0400 Subject: add freetts as a build dep --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Uploaders: Keith Packard -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 -- 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(-) 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 9ea94411c9730f7a271366d309ab4827beeeb839 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 11:17:54 -0600 Subject: add a dummy install target --- ao-tools/libaltos/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ao-tools/libaltos/Makefile b/ao-tools/libaltos/Makefile index a251e54e..9933dc80 100644 --- a/ao-tools/libaltos/Makefile +++ b/ao-tools/libaltos/Makefile @@ -1,5 +1,8 @@ OS:=$(shell uname) +# dummy install target for now so I can work on the rest of the packaging +install: + @echo warning - make install doing nothing in libaltos! # # Linux # -- cgit v1.2.3 From a21b6bb60ac1c07ebd161534a4ea63bfde50dcdf Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 11:26:29 -0600 Subject: lose the prebuild hook for now while I'm fumbling --- debian/gbp.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index 9561fdfe..9c366c76 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,7 +4,8 @@ # the default build command: #builder = debuild -i\.git/ -I.git # the default clean command: -cleaner = debian/rules prebuild && debuild clean +#cleaner = debian/rules prebuild && debuild clean +cleaner = debuild clean # the default branch for upstream sources: upstream-branch = upstream # the default branch for the debian patch: -- cgit v1.2.3 From 72c33a72ee105ec692dad62d6d9c1ad40b89bfe8 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 11:45:19 -0600 Subject: add install target for libaltos --- ao-tools/libaltos/Makefile | 6 +++--- debian/dirs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ao-tools/libaltos/Makefile b/ao-tools/libaltos/Makefile index 9933dc80..cd96fd5f 100644 --- a/ao-tools/libaltos/Makefile +++ b/ao-tools/libaltos/Makefile @@ -1,8 +1,5 @@ OS:=$(shell uname) -# dummy install target for now so I can work on the rest of the packaging -install: - @echo warning - make install doing nothing in libaltos! # # Linux # @@ -17,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/dirs b/debian/dirs index db75fea7..6bf06c6e 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,5 +1,6 @@ etc/apt/sources.list.d usr/bin +usr/lib/altos usr/share/altos usr/share/applications usr/share/gdm/themes/altusmetrum -- cgit v1.2.3 From 72a18502e40f55cbba6418dc94315517881cd411 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 11:51:24 -0600 Subject: add an install target for altosui --- ao-tools/altosui/Makefile | 7 ++++++- debian/dirs | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index d3ecb889..258a334f 100644 --- a/ao-tools/altosui/Makefile +++ b/ao-tools/altosui/Makefile @@ -96,8 +96,13 @@ 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 altosui.jar" >> $@ 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 + endif clean: diff --git a/debian/dirs b/debian/dirs index 6bf06c6e..7b4dffb8 100644 --- a/debian/dirs +++ b/debian/dirs @@ -4,5 +4,6 @@ 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 -- cgit v1.2.3 From c280071b7db4e9a7af31dc5740eb8d27f137950e Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 12:04:13 -0600 Subject: fix up the wrapper's path to the jar file --- ao-tools/altosui/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index 258a334f..73bc230d 100644 --- a/ao-tools/altosui/Makefile +++ b/ao-tools/altosui/Makefile @@ -96,7 +96,7 @@ endif ifeq ($(OS),Linux) altosui: echo "#!/bin/sh" > $@ - echo "exec java -Djava.library.path=/usr/lib/altos/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 -- cgit v1.2.3 From 138009e9fad01f79df4c3820fbc206f78688bdce Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 12:06:01 -0600 Subject: update Debian standards version --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Uploaders: Keith Packard 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 -- 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 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 a8dbe082960dc9bdd44c6e4b1198423c4e566029 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 12:18:28 -0600 Subject: install altosui man page --- ao-tools/altosui/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index 101954db..df960130 100644 --- a/ao-tools/altosui/Makefile +++ b/ao-tools/altosui/Makefile @@ -101,6 +101,7 @@ 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/altosui.1 /usr/bin/install altosui $(DESTDIR)/usr/bin/altosui endif -- cgit v1.2.3 From de2e71c4923a0282df74dbe37d087c34b4ddd279 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 12:25:20 -0600 Subject: fix man page delivery path --- ao-tools/altosui/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index df960130..22752d5d 100644 --- a/ao-tools/altosui/Makefile +++ b/ao-tools/altosui/Makefile @@ -101,7 +101,7 @@ 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/altosui.1 + /usr/bin/install -m 0644 altosui.1 $(DESTDIR)/usr/share/man/man1/altosui.1 /usr/bin/install altosui $(DESTDIR)/usr/bin/altosui endif -- cgit v1.2.3 From ae5eff7bc0b63047737223423009707bedcb00f5 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Fri, 27 Aug 2010 12:37:36 -0600 Subject: Revert "lose the prebuild hook for now while I'm fumbling" This reverts commit a21b6bb60ac1c07ebd161534a4ea63bfde50dcdf. --- debian/gbp.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index 9c366c76..9561fdfe 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,8 +4,7 @@ # the default build command: #builder = debuild -i\.git/ -I.git # the default clean command: -#cleaner = debian/rules prebuild && debuild clean -cleaner = debuild clean +cleaner = debian/rules prebuild && debuild clean # the default branch for upstream sources: upstream-branch = upstream # the default branch for the debian patch: -- cgit v1.2.3