X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=debian%2Frules;h=6af664d899325494296d470382db0bdb7367ff12;hb=refs%2Fheads%2Ffp-integration-20.1;hp=099680ea2a07225003975012d2750841362fe2f1;hpb=89783101ce3f832ee0e55d6a862a51f3176c2e6f;p=GpsPrune.git

diff --git a/debian/rules b/debian/rules
index 099680e..6af664d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ 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
@@ -15,8 +15,10 @@ export JH_JAR_EXTRA=$(shell find tim/prune/lang/ tim/prune/gui/images -type f) t
 #	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 tim/prune/function/srtm/viewfinder/tiles.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