From 2f114c7ff6b0deddb790d34139bb11ac37f8c0da Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 29 Jul 2010 13:30:36 -0600 Subject: update changelogs for Debian build --- debian/changelog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8d6412f0..106941d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +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 Thu, 29 Jul 2010 13:30:19 -0600 + altos (0.6+277+gd184819) unstable; urgency=low [ Bdale Garbee ] -- cgit v1.2.3 From e3a9e3815db3f290e28b40ae02aa654f515cfc37 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 31 Jul 2010 10:55:27 -0600 Subject: update changelogs for Debian build --- ChangeLog | 12 ++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 18 insertions(+) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 40fd5fe4..4acfeae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +commit 8fc261c2b77bb8aab201a0649a84b5ffa236ce26 +Author: Bdale Garbee +Date: Sat Jul 31 10:55:07 2010 -0600 + + see if my new freetts package works + +commit 2f114c7ff6b0deddb790d34139bb11ac37f8c0da +Author: Bdale Garbee +Date: Thu Jul 29 13:30:36 2010 -0600 + + update changelogs for Debian build + commit 7877496d47ce6d25210c0e1c6500666dbfc0876c Merge: c71061a 4cf39b1 Author: Keith Packard diff --git a/debian/changelog b/debian/changelog index 106941d9..5d07e30d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +altos (0.6+292+g8fc261c) unstable; urgency=low + + * see if my new freetts package works + + -- Bdale Garbee Sat, 31 Jul 2010 10:55:21 -0600 + altos (0.6+290+g7877496) unstable; urgency=low [ Keith Packard ] -- cgit v1.2.3 From 02f17f2cd26189e2676a9dc0d86bd959ed0bc3f4 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Aug 2010 00:54:05 -0400 Subject: move to science menu --- debian/altos.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/altos.desktop b/debian/altos.desktop index ae9bdc63..106e34a0 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=Science; -- cgit v1.2.3 From aed55ef1ce45b0f6e6fefeebf50be97607b31d65 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 +++++++++++++++++---------------- ao-tools/altosui/Manifest.txt | 2 +- debian/altos.desktop | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile index 790aecda..bae42c9a 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=\ AltosConvert.class \ AltosEeprom.class \ @@ -20,16 +20,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 @@ -55,14 +56,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 @@ -81,6 +82,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 1f313a13..504d0de3 100644 --- a/ao-tools/altosui/Manifest.txt +++ b/ao-tools/altosui/Manifest.txt @@ -1,2 +1,2 @@ Main-Class: altosui.AltosUI -Class-Path: /usr/share/java/freetts-1.2.2.jar +Class-Path: /usr/share/java/freetts.jar diff --git a/debian/altos.desktop b/debian/altos.desktop index 106e34a0..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=Science; +Categories=Education;Science; -- cgit v1.2.3 From d091099753d9cae01c4805812425ebea19ec09cf Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Aug 2010 15:00:46 -0400 Subject: update changelogs for Debian build --- ChangeLog | 18 ++++++++++++++++++ debian/changelog | 7 +++++++ 2 files changed, 25 insertions(+) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 4acfeae4..04e360b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +commit aed55ef1ce45b0f6e6fefeebf50be97607b31d65 +Author: Bdale Garbee +Date: Thu Aug 5 15:00:15 2010 -0400 + + working on java packaging details + +commit 02f17f2cd26189e2676a9dc0d86bd959ed0bc3f4 +Author: Bdale Garbee +Date: Thu Aug 5 00:54:05 2010 -0400 + + move to science menu + +commit e3a9e3815db3f290e28b40ae02aa654f515cfc37 +Author: Bdale Garbee +Date: Sat Jul 31 10:55:27 2010 -0600 + + update changelogs for Debian build + commit 8fc261c2b77bb8aab201a0649a84b5ffa236ce26 Author: Bdale Garbee Date: Sat Jul 31 10:55:07 2010 -0600 diff --git a/debian/changelog b/debian/changelog index 5d07e30d..9c807101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +altos (0.6+295+gaed55ef) unstable; urgency=low + + * move to science menu + * working on java packaging details + + -- Bdale Garbee Thu, 05 Aug 2010 15:00:37 -0400 + altos (0.6+292+g8fc261c) unstable; urgency=low * see if my new freetts package works -- cgit v1.2.3 From 0b85160c44d934f3d1352c1c07c296d01ceffc32 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Aug 2010 15:02:17 -0400 Subject: update changelogs for Debian build --- ChangeLog | 6 ++++++ debian/changelog | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 04e360b4..69a49f42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit d091099753d9cae01c4805812425ebea19ec09cf +Author: Bdale Garbee +Date: Thu Aug 5 15:00:46 2010 -0400 + + update changelogs for Debian build + commit aed55ef1ce45b0f6e6fefeebf50be97607b31d65 Author: Bdale Garbee Date: Thu Aug 5 15:00:15 2010 -0400 diff --git a/debian/changelog b/debian/changelog index 9c807101..3f8a079f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -altos (0.6+295+gaed55ef) unstable; urgency=low +altos (0.6+296+gd091099) unstable; urgency=low * move to science menu * working on java packaging details -- cgit v1.2.3 From 410de62715a0830f03b0a65d6c7730dff51e6ef4 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(-) (limited to 'debian') 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 e075b8623533965b1b77b77d38c2df32f5f77fce Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Aug 2010 15:16:24 -0400 Subject: update changelogs for Debian build --- ChangeLog | 12 ++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 18 insertions(+) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 69a49f42..1fd15a41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +commit 410de62715a0830f03b0a65d6c7730dff51e6ef4 +Author: Bdale Garbee +Date: Thu Aug 5 15:15:04 2010 -0400 + + add freetts as a build dep + +commit 0b85160c44d934f3d1352c1c07c296d01ceffc32 +Author: Bdale Garbee +Date: Thu Aug 5 15:02:17 2010 -0400 + + update changelogs for Debian build + commit d091099753d9cae01c4805812425ebea19ec09cf Author: Bdale Garbee Date: Thu Aug 5 15:00:46 2010 -0400 diff --git a/debian/changelog b/debian/changelog index 3f8a079f..8185ed0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +altos (0.6+298+g410de62) unstable; urgency=low + + * add freetts as a build dep + + -- Bdale Garbee Thu, 05 Aug 2010 15:16:07 -0400 + altos (0.6+296+gd091099) unstable; urgency=low * move to science menu -- cgit v1.2.3 From a0a9b445a4d379730b67720f8d7b682d5206a582 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 5 Aug 2010 15:16:48 -0400 Subject: update changelogs for Debian build --- ChangeLog | 6 ++++++ debian/changelog | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 1fd15a41..3b2af868 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit e075b8623533965b1b77b77d38c2df32f5f77fce +Author: Bdale Garbee +Date: Thu Aug 5 15:16:24 2010 -0400 + + update changelogs for Debian build + commit 410de62715a0830f03b0a65d6c7730dff51e6ef4 Author: Bdale Garbee Date: Thu Aug 5 15:15:04 2010 -0400 diff --git a/debian/changelog b/debian/changelog index 8185ed0f..23a4cf8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,6 @@ -altos (0.6+298+g410de62) unstable; urgency=low +altos (0.6+299+ge075b86) unstable; urgency=low * add freetts as a build dep - - -- Bdale Garbee Thu, 05 Aug 2010 15:16:07 -0400 - -altos (0.6+296+gd091099) unstable; urgency=low - * move to science menu * working on java packaging details -- cgit v1.2.3 From f63f16a70e4d0535667a6364cafcbff026ee6a8c Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 11 Aug 2010 08:36:59 -0400 Subject: update changelogs for Debian build --- ChangeLog | 6 ++++++ debian/changelog | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 3b2af868..c8e2417e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit a0a9b445a4d379730b67720f8d7b682d5206a582 +Author: Bdale Garbee +Date: Thu Aug 5 15:16:48 2010 -0400 + + update changelogs for Debian build + commit e075b8623533965b1b77b77d38c2df32f5f77fce Author: Bdale Garbee Date: Thu Aug 5 15:16:24 2010 -0400 diff --git a/debian/changelog b/debian/changelog index 23a4cf8b..b252d601 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -altos (0.6+299+ge075b86) unstable; urgency=low +altos (0.6+300+ga0a9b44) unstable; urgency=low * add freetts as a build dep * move to science menu -- cgit v1.2.3 From 4918f73fd0a0f3f5d52907f95a0ec385e901d447 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 11 Aug 2010 08:50:27 -0400 Subject: update changelogs for Debian build --- ChangeLog | 6 ++++++ debian/changelog | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index c8e2417e..5dcedb2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit f63f16a70e4d0535667a6364cafcbff026ee6a8c +Author: Bdale Garbee +Date: Wed Aug 11 08:36:59 2010 -0400 + + update changelogs for Debian build + commit a0a9b445a4d379730b67720f8d7b682d5206a582 Author: Bdale Garbee Date: Thu Aug 5 15:16:48 2010 -0400 diff --git a/debian/changelog b/debian/changelog index b252d601..09e1b6cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -altos (0.6+300+ga0a9b44) unstable; urgency=low +altos (0.6+301+gf63f16a) unstable; urgency=low * add freetts as a build dep * move to science menu -- cgit v1.2.3 From b6da90b4627dde1fe88240c38c51559d8f781dd0 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 11 Aug 2010 17:15:39 -0400 Subject: update changelogs for Debian build --- ChangeLog | 6 ++++++ debian/changelog | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 5dcedb2a..e4570404 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit 4918f73fd0a0f3f5d52907f95a0ec385e901d447 +Author: Bdale Garbee +Date: Wed Aug 11 08:50:27 2010 -0400 + + update changelogs for Debian build + commit f63f16a70e4d0535667a6364cafcbff026ee6a8c Author: Bdale Garbee Date: Wed Aug 11 08:36:59 2010 -0400 diff --git a/debian/changelog b/debian/changelog index 09e1b6cb..f14342d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -altos (0.6+301+gf63f16a) unstable; urgency=low +altos (0.6+302+g4918f73) unstable; urgency=low * add freetts as a build dep * move to science menu -- cgit v1.2.3 From 9d1b27fa147fc8b765d5be165ebef7ee0f85bd37 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 11 Aug 2010 22:11:50 -0400 Subject: update changelogs for Debian build --- ChangeLog | 6 ++++++ debian/changelog | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index e4570404..33986884 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit b6da90b4627dde1fe88240c38c51559d8f781dd0 +Author: Bdale Garbee +Date: Wed Aug 11 17:15:39 2010 -0400 + + update changelogs for Debian build + commit 4918f73fd0a0f3f5d52907f95a0ec385e901d447 Author: Bdale Garbee Date: Wed Aug 11 08:50:27 2010 -0400 diff --git a/debian/changelog b/debian/changelog index f14342d8..6a47c8a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -altos (0.6+302+g4918f73) unstable; urgency=low +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 Thu, 05 Aug 2010 15:00:37 -0400 + -- Bdale Garbee Wed, 11 Aug 2010 22:11:28 -0400 altos (0.6+292+g8fc261c) unstable; urgency=low -- cgit v1.2.3