working on java packaging details

diff --git a/ao-tools/altosui/Makefile b/ao-tools/altosui/Makefile
index 790aecdabefcb570065df7516e9af59f4e1440e0..bae42c9ac14cd41d565db70cbe568bf03938abc0 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=\
        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 1f313a13dd2af0f2b5f46a50ed947f5a16a455a5..504d0de30a999572aae33f876460cad52cee0125 100644 (file)
--- 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 106e34a058dbc56cfe9157e32338875778e7df7d..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=Science;
+Categories=Education;Science;