From: Bdale Garbee <bdale@gag.com>
Date: Tue, 24 Aug 2010 05:11:22 +0000 (-0600)
Subject: Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-packa... 
X-Git-Tag: debian/0.6+373+gcf65c6b~1^2~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=295043112ccde35092945c286596f9045ee6fa05;hp=ef8376c4dd8262a34e02b6bb9e19e907ac2f4330

Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-package-format
---

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index affbac39..d4d3ee7a 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 \
@@ -37,16 +37,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
 
@@ -72,14 +73,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
@@ -98,6 +99,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;
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