use more of javahelper

[debian/freetts] / debian / rules

diff --git a/debian/rules b/debian/rules
index 734a2148d30ac8fc7ce87e6b1527b3a2740aeb96..d249843d546aa7feff9a04f3385b29e2bca363a9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,15 +13,20 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 #export CLASSPATH=
 
 %:
-       dh  $@ --with javahelper
+       dh  $@
+#      dh  $@ --with javahelper
 
 override_dh_auto_build:
        ln -sf . src
-       ant all
-       ant javadoc
+       ant debian
 
-#override_dh_auto_install:
-#      cp deploy/*.jar `pwd`/debian/freetts/usr/share/java/
+override_dh_auto_clean:
+       dh_auto_clean
+       rm -f src
+
+override_dh_auto_install:
+       jh_installlibs deploy/*.jar
+       jh_installjavadoc javadoc
 #      printf '#!/bin/sh\njava -jar /usr/share/java/%s\n' \
 #              "`/bin/ls build/jar`" > \
 #              `pwd`/debian/openrocket/usr/bin/openrocket