X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=debian%2Frules;h=2665ee3bc9cda13ae710b6cfc6b9fd6c6ee8dbde;hb=e60333e4368c517409254fa74c58bd1023ad6c80;hp=10c4a5e994104b5158dfda0c1a3823e505e0396a;hpb=3ee0d375b04308d65e32732f5999b516874931b8;p=GpsPrune.git

diff --git a/debian/rules b/debian/rules
index 10c4a5e..2665ee3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,21 +2,23 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/j3dcore.jar:/usr/share/java/j3dutils.jar:/usr/share/java/vecmath.jar
 
-export JH_JAR_EXTRA=$(shell find tim/prune/lang/ tim/prune/gui/images -type f) tim/prune/function/srtm/srtmtiles.dat
+# export JH_JAR_EXTRA=$(shell find src/tim/prune/lang/ src/tim/prune/gui/images -type f) src/tim/prune/function/srtm/srtmtiles.dat
 
-srtmtiles:
-	javac tim/prune/function/srtm/gen/GenerateTileLookup.java
-	CLASSPATH=. java tim.prune.function.srtm.gen.GenerateTileLookup
-	mv $(CURDIR)/srtmtiles.dat tim/prune/function/srtm/
-	rm -rf tim/prune/function/srtm/gen/GenerateTileLookup.class
+#srtmtiles:
+#	javac tim/prune/function/srtm/gen/GenerateTileLookup.java
+#	CLASSPATH=. java tim.prune.function.srtm.gen.GenerateTileLookup
+#	mv $(CURDIR)/srtmtiles.dat tim/prune/function/srtm/
+#	rm -rf tim/prune/function/srtm/gen/GenerateTileLookup.class
 
-override_jh_build: srtmtiles
+override_jh_build:
 	jh_build --no-javadoc
+	# JH_JAR_EXTRA is broken
+	cd src; jar uf ../gpsprune.jar tim/prune/*.txt tim/prune/lang/* tim/prune/gui/images  tim/prune/function/srtm/srtmtiles.dat
 
 override_jh_depends:
 	jh_depends -v -Xlibjava3d-java -Xlibvecmath-java -Xlibjava3d-jni
@@ -33,7 +35,7 @@ override_dh_auto_install:
 	dh_auto_install
 
 	# Install application icon
-	for size in 16 22 24 32 36 48 64 72 96 128; do \
+	for size in 16 20 22 24 32 36 48 64 72 96 128; do \
 		install -o root -g root -d $(CURDIR)/debian/gpsprune/usr/share/icons/hicolor/$${size}x$${size}/apps ; \
-		install -o root -g root -m 644 $(CURDIR)/tim/prune/gui/images/window_icon_$${size}.png $(CURDIR)/debian/gpsprune/usr/share/icons/hicolor/$${size}x$${size}/apps/gpsprune.png ; \
+		install -o root -g root -m 644 $(CURDIR)/src/tim/prune/gui/images/window_icon_$${size}.png $(CURDIR)/debian/gpsprune/usr/share/icons/hicolor/$${size}x$${size}/apps/gpsprune.png ; \
 	done