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

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 1273e7d4990ba58b29388881e9156ea96ac366c2..d3ecb889d909b3f83afd2df15d6a8ba1c15d2641 100644 (file)
--- 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 \
@@ -39,16 +39,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
 
@@ -74,14 +75,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
@@ -100,6 +101,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 ae9bdc63428643597e3742a2a0f172f8d384e899..4281ad3aaf0abeb3e8f53d0df50834f21142ad1f 100644 (file)
--- 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 ba9354b8eddfaabbf3dea01f50821aea2a46ddc6..cc8fda9499443c91274e2954e39e3d156fe55633 100644 (file)
--- 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